Merge pull request #3 from nds-org/workbench-singlepod-updates

Update cluster-backup to work with Workbench running in a single pod
nds-org · Jun 8, 2020 · aa7f6ae · aa7f6ae
2 parents d1a683f + 9ec0511
commit aa7f6ae
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 30 deletions.
diff --git a/cluster-backup.yaml b/cluster-backup.yaml
@@ -2,46 +2,28 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: cluster-backup
+  name: backup-shell
+  namespace: workbench
   labels:
-    app: cluster-backup
+    app: backup-shell
 spec:
   template:
     metadata:
+      name: backup-shell
+      namespace: workbench
       labels:
-        name: cluster-backup
+        name: backup-shell
     spec:
       hostNetwork: true
       containers:
         - image: ndslabs/cluster-backup:latest
           imagePullPolicy: Always
-          name: cluster-backup
+          name: backup
+          stdin: true
+          tty: true
+          command: [ "/bin/bash" ]
           env:
            - name: ETCD_HOST
-             value: $(NDSLABS_ETCD_SERVICE_HOST)
+             value: $(WORKBENCH_ETCD_SERVICE_HOST)
            - name: ETCD_PORT
-             value: $(NDSLABS_ETCD_SERVICE_PORT)
-           - name: BACKUP_SRC
-             value: "/var/glfs"
-           - name: BACKUP_DEST
-             value: /ndsbackup
-           - name: BACKUP_HOST
-             value: 
-           - name: BACKUP_USER
-             value: 
-           - name: BACKUP_KEY
-             value: "/etc/backup-key/ssh-privatekey"
-          volumeMounts:
-            - name: backup-src
-              mountPath: /var/glfs
-            - name: backup-key
-              readOnly: true
-              mountPath: /etc/backup-key/
-      volumes:
-        - name: backup-src
-          hostPath:
-              path: /var/glfs
-        - name: backup-key
-          secret:
-            secretName: backup-key
-            defaultMode: 0600
+             value: $(WORKBENCH_ETCD_SERVICE_PORT)
diff --git a/workbench-etcd.service.yaml b/workbench-etcd.service.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    component: workbench
+  name: workbench-etcd
+  namespace: workbench
+spec:
+  ports:
+  - name: etcd
+    port: 4001
+    protocol: TCP
+  selector:
+    component: workbench