test env var

Author: ggtrd

src/main.py

@@ -203,9 +203,14 @@ def main():
     parser.add_argument("-m", "--map", action="store_true", help="Get the backup map")
     args = parser.parse_args()
 
-    cluster_name = args.context
-    namespace = args.namespace
 
+    cluster_name_env = os.getenv("CLUSTER_NAME")
+    namespace_env = os.getenv("NAMESPACE")
+
+    cluster_name = cluster_name_env if cluster_name_env else args.context
+    namespace = namespace_env if namespace_env else args.namespace
+
+    
     # # Export env to use from YAML templates 
     # os.environ["CLUSTER_NAME"] = cluster_name
     # os.environ["NAMESPACE"] = namespace
@@ -219,8 +224,8 @@ def main():
     #     print("error: Namespace must be defined via NAMESPACE env or --namespace arg.")
     #     sys.exit(1)
 
-    # for key, value in os.environ.items():
-    #     print('{}: {}'.format(key, value))
+    for key, value in os.environ.items():
+        print('{}: {}'.format(key, value))
 
     kube = Kubernetes(context=cluster_name, namespace=namespace)
     kube_client_sigkill = kube

src/worker.py

@@ -53,6 +53,8 @@ def main():
     for key, value in os.environ.items():
         print('{}: {}'.format(key, value))
 
+
+
     if not storage_address or not storage_username:
         print("error: STORAGE_ADDRESS or STORAGE_USERNAME environment variable is missing.")
         sys.exit(1)

templates/backup.job.yaml

@@ -36,6 +36,7 @@ spec:
               mountPath: "{{ MOUNTED_PATH }}"
               readOnly: true
           env:
+
             - name: STORAGE_ADDRESS
               valueFrom:
                 secretKeyRef:
@@ -54,6 +55,7 @@ spec:
                   name: clustersnap-config
                   key: storage-password
                   optional: false
+
             - name: CLUSTER_NAME
               valueFrom:
                 secretKeyRef:
@@ -62,10 +64,8 @@ spec:
                   optional: false
             - name: NAMESPACE
               valueFrom:
-                secretKeyRef:
-                  name: clustersnap-config
-                  key: namespace
-                  optional: false
+                fieldRef:
+                  fieldPath: metadata.namespace
       volumes:
         - name: volume-to-backup
           persistentVolumeClaim:

templates/backup.secret.yaml

@@ -8,5 +8,4 @@ data:
   storage-address: Y2hhbmdlbWU= # changeme
   storage-username: Y2hhbmdlbWU= # changeme
   storage-password: Y2hhbmdlbWU= # changeme
-  cluster-name: Y2hhbmdlbWU= # changeme
-  namespace: Y2hhbmdlbWU= # changeme
+  cluster-name: Y2hhbmdlbWU= # changeme

templates/orchestrator.deployment.yaml

@@ -8,6 +8,17 @@ spec:
     - name: clustersnap
       image: ghcr.io/cosmo-tech/clustersnap:latest
       imagePullPolicy: Always
+      env:
+        - name: CLUSTER_NAME
+          valueFrom:
+            secretKeyRef:
+              name: clustersnap-config
+              key: cluster-name
+              optional: false
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
   imagePullSecrets:
     - name: registry-auth-clustersnap
   serviceAccountName: clustersnap