test env var

Author: ggtrd

src/kubernetes/__init__.py

@@ -7,7 +7,7 @@
 
 class Kubernetes:
 
-    def __init__(self, context: str = None, namespace: str = None):
+    def __init__(self, context: str, namespace: str):
         self.context = context
         self.namespace = namespace
         try:

src/main.py

@@ -206,9 +206,9 @@ def main():
     cluster_name = args.context
     namespace = args.namespace
 
-    # Export env to use from YAML templates 
-    os.environ["CLUSTER_NAME"] = cluster_name
-    os.environ["NAMESPACE"] = namespace
+    # # Export env to use from YAML templates 
+    # os.environ["CLUSTER_NAME"] = cluster_name
+    # os.environ["NAMESPACE"] = namespace
 
 
     # if not cluster_name:

src/worker.py

@@ -42,13 +42,14 @@ def main():
     parser.add_argument("--pvc", type=str, required=True, help="Name of the PVC")
     args = parser.parse_args()
 
+    # Env var from YAML template
     storage_address = os.getenv("STORAGE_ADDRESS")
     storage_username = os.getenv("STORAGE_USERNAME")
     storage_password = os.getenv("STORAGE_PASSWORD")
     cluster_name = os.getenv("CLUSTER_NAME")
     namespace = os.getenv("NAMESPACE")
 
-    
+
     for key, value in os.environ.items():
         print('{}: {}'.format(key, value))
 
@@ -60,8 +61,7 @@ def main():
         print(f"error: source path '{args.path}' does not exist.")
         sys.exit(1)
 
-    # kube = Kubernetes(context=None, namespace=None)
-    kube = Kubernetes()
+    kube = Kubernetes(context=cluster_name, namespace=namespace)
 
     # ------------------------------
     # STORAGE PROVIDER DETECTION

templates/backup.job.yaml

@@ -55,9 +55,17 @@ spec:
                   key: storage-password
                   optional: false
             - name: CLUSTER_NAME
-              value: "{{ CLUSTER_NAME }}"
+              valueFrom:
+                secretKeyRef:
+                  name: clustersnap-config
+                  key: cluster-name
+                  optional: false
             - name: NAMESPACE
-              value: "{{ NAMESPACE }}"
+              valueFrom:
+                secretKeyRef:
+                  name: clustersnap-config
+                  key: namespace
+                  optional: false
       volumes:
         - name: volume-to-backup
           persistentVolumeClaim:

templates/backup.secret.yaml

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