wip: standalone cli

Author: ggtrd

src/cli.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import argparse
 import signal
@@ -19,7 +20,8 @@ def main():
     # Global options
     global_group = parser.add_argument_group("global")
     global_group.add_argument("-c", "--context", type=str, metavar="CT", default=None, help="Local kubectl context")
-    global_group.add_argument("-n", "--namespace", type=str, metavar="NS", default=None, help="Target a namespace for backup job run")
+    global_group.add_argument("-n", "--namespace", type=str, metavar="NS", default=None, help="Target a namespace for backup job run. Using 'default' if not given.")
+    global_group.add_argument("-i", "--instance", type=str, metavar="NS", default=None, help="Target a running instance of bkup. Using 'bkup' if not given.")
     global_group.add_argument("-j", "--job", action="store_true", help="Run backup job(s) based on current backup-map")
     global_group.add_argument("-bm", "--backup-map", action="store_true", help="Manage backup-map configuration")
 
@@ -32,11 +34,21 @@ def main():
     args = parser.parse_args()
 
     cluster_context = args.context
+    os.environ["CLUSTER_CONTEXT"] = cluster_context
+
     namespace_input = args.namespace
     if namespace_input:
         namespace = namespace_input
     else:
         namespace = "default"
+    os.environ["TARGET_NAMESPACES"] = namespace
+
+    instance_input = args.instance
+    if instance_input:
+        instance = instance_input
+    else:
+        instance = 'bkup'
+    os.environ["INSTALLATION_NAME"] = instance
 
     # Strict validation of -bm sub-options usage
     if (args.apply or args.preview or args.get_current) and not args.backup_map:
@@ -51,6 +63,18 @@ def main():
 
 
     if args.job:
+        master_ns = config_secret.get_config_secret_namespace(kube)
+        backup_map_name = backup_map.get_backup_map_name()
+
+        # Verify ConfigMap existence before processing
+        saved_map = backup_map.get_backup_map_content(kube, namespace=master_ns)
+        if not saved_map or not saved_map.get("namespaces"):
+            print(f"error: ConfigMap '{backup_map_name}' is missing or empty in namespace '{master_ns}'.")
+            print("hint: Generate and apply one first using 'bkup -bm -a'")
+            sys.exit(1)
+
+        print(f"{yaml.dump(saved_map, sort_keys=False, default_flow_style=False)}\n")
+
         master.main()
 
     elif args.backup_map:

src/kubernetes/base.py

@@ -2,6 +2,7 @@
 import yaml
 import time
 import hashlib
+import base64
 from kubernetes import client, config
 
 
@@ -303,8 +304,6 @@ def save_to_configmap(self, name: str, namespace: str, data: dict):
 
     def get_secret_payload(self, name: str, namespace: str) -> dict:
         """Centralized and safe extraction of Secret base64 values decoded into a plain text map."""
-        import base64
-
         try:
             secret = self.core_v1.read_namespaced_secret(name=name, namespace=namespace)
             if not secret.data:
@@ -396,25 +395,25 @@ def _launch_generic_job(self, template_path: str, replacements: dict):
                 if name == "STORAGE_ADDRESS":
                     val = secret_data.get("storage-address")
                     if not val:
-                        raise ValueError(f"Required key 'storage-address' missing in Secret 'bkup-config' (namespace: '{master_ns}')")
+                        raise ValueError(f"Required key 'storage-address' missing in 'config' Secret (namespace: '{master_ns}')")
                     final_overrides[name] = {"name": name, "value": val}
 
                 elif name == "STORAGE_USERNAME":
                     val = secret_data.get("storage-username")
                     if not val:
-                        raise ValueError(f"Required key 'storage-username' missing in Secret 'bkup-config' (namespace: '{master_ns}')")
+                        raise ValueError(f"Required key 'storage-username' missing in 'config' Secret (namespace: '{master_ns}')")
                     final_overrides[name] = {"name": name, "value": val}
 
                 elif name == "STORAGE_PASSWORD":
                     val = secret_data.get("storage-password")
                     if not val:
-                        raise ValueError(f"Required key 'storage-password' missing in Secret 'bkup-config' (namespace: '{master_ns}')")
+                        raise ValueError(f"Required key 'storage-password' missing in 'config' Secret (namespace: '{master_ns}')")
                     final_overrides[name] = {"name": name, "value": val}
 
                 elif name == "CLUSTER_NAME":
                     val = secret_data.get("cluster-name")
                     if not val:
-                        raise ValueError(f"Required key 'cluster-name' missing in Secret 'bkup-config' (namespace: '{master_ns}')")
+                        raise ValueError(f"Required key 'cluster-name' missing (namespace: '{master_ns}')")
                     final_overrides[name] = {"name": name, "value": val}
 
                 else:

src/master.py

@@ -1,8 +1,10 @@
+import os
 import sys
 import argparse
 import signal
 import yaml
 
+from src.kubernetes.base import KubernetesBase
 from src.kubernetes.job_volume import VolumeBackupJob
 from src.kubernetes.job_postgresql import PostgresBackupJob
 import src.utils.psql as psql
@@ -117,7 +119,7 @@ def run_backup_job(cluster_context: str, namespace: str):
     # STRICT BACKUP-MAP CHECK
     # --------------------------------------------------
     ns_claims_entries = []
-    backup_map_config = backup_map.get_backup_map(kube, master_ns=master_ns)
+    backup_map_config = backup_map.get_backup_map_content(kube, master_ns=master_ns)
 
     if isinstance(backup_map_config, dict) and "namespaces" in backup_map_config:
         for ns_entry in backup_map_config.get("namespaces", []):
@@ -351,23 +353,29 @@ def main():
     # ----------------------------------
     # Reject if kube context if missing
     try:
-        kube = VolumeBackupJob(context=cluster_context, namespace="default")
+        cluster_context = os.environ["CLUSTER_CONTEXT"]
+        target_namespaces = os.environ["TARGET_NAMESPACES"]
+
+        kube = KubernetesBase(context=cluster_context, namespace=namespace)
         kube_client_sigkill = kube
     except Exception as e:
         print(f"error: {e}")
         sys.exit(1)
 
-    master_ns = config_secret.get_config_secret_namespace(kube)
-    kube.namespace = master_ns
+    # master_ns = config_secret.get_config_secret_namespace(kube)
+    # kube.namespace = master_ns
 
-    # Verify ConfigMap existence before processing
-    saved_map = backup_map.get_backup_map(kube, master_ns=master_ns)
-    if not saved_map or not saved_map.get("namespaces"):
-        print(f"error: ConfigMap 'bkup-backup-map' is missing or empty in namespace '{master_ns}'.")
-        print("hint: Generate and apply one first using 'bkup -bm -a'")
-        sys.exit(1)
+    # backup_map_name = backup_map.get_backup_map_name
+    # backup_map_ns = master_ns
+
+    # # Verify ConfigMap existence before processing
+    # saved_map = backup_map.get_backup_map_content(kube, namespace=backup_map_ns)
+    # if not saved_map or not saved_map.get("namespaces"):
+    #     print(f"error: ConfigMap '{backup_map_name}' is missing or empty in namespace '{backup_map_ns}'.")
+    #     print("hint: Generate and apply one first using 'bkup -bm -a'")
+    #     sys.exit(1)
 
-    print(f"{yaml.dump(saved_map, sort_keys=False, default_flow_style=False)}\n")
+    # print(f"{yaml.dump(saved_map, sort_keys=False, default_flow_style=False)}\n")
 
     # If a single namespace is targeted via -n, execute only this one
     if namespace_input:

src/utils/backup_map.py

@@ -9,11 +9,11 @@ def get_backup_map_name():
     return f"{general_helper.get_installation_name()}-backup-map"
 
 
-def get_backup_map(kube, master_ns: str = None) -> dict:
+def get_backup_map_content(kube, namespace: str = None) -> dict:
     """Get existing ConfigMap of the backup-map."""
     cm_name = get_backup_map_name()
 
-    target_ns = master_ns if master_ns else kube.get_namespace()
+    target_ns = namespace if namespace else kube.get_namespace()
     saved_map = kube.get_configmap(name=cm_name, namespace=target_ns)
 
     if not saved_map:

src/utils/config_secret.py

@@ -6,16 +6,12 @@ def get_config_secret_name():
     return f"{general_helper.get_installation_name()}-backup-map"
 
 
-def get_config_secret_namespace(kube_client) -> str:
+def get_config_secret_namespace(kube) -> str:
     """Find the namespace containing the 'config' Secret."""
-
-    secret_name = f"{general_helper.get_installation_name()}-config"
-
-    for ns in kube_client.list_namespaces():
-        try:
-            if kube_client.get_secret_payload(name=secret_name, namespace=ns):
+    try:
+        for ns in kube.list_namespaces():
+            secret_name = f"{general_helper.get_installation_name()}-config"
+            if kube.get_secret_payload(f"{secret_name}-config", namespace=ns):
                 return ns
-        except Exception:
-            continue
-
-    raise RuntimeError("Error: Secret 'config' not found in any namespace.")
+    except Exception as e:
+        print(f"Error: Secret 'config' not found in any namespace. {e}")

templates_install/config.secret.yaml

@@ -5,8 +5,6 @@ metadata:
   namespace: ${NAMESPACE}
 type: Opaque
 stringData:
-  backup-map-namespace: ${NAMESPACE} # Can be anything else, but default is the same as current secret
-  cluster-name: changeme
   storage-address: changeme
   storage-username: changeme
   storage-password: changeme

templates_install/master.pod.ci.yaml

@@ -11,15 +11,23 @@ spec:
       imagePullPolicy: Always
       env:
         - name: CLUSTER_NAME
-          valueFrom:
-            secretKeyRef:
-              name: bkup-config
-              key: cluster-name
-              optional: false
+          value: ${CLUSTER_NAME}
         - name: NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-  imagePullSecrets:
+        - name: INSTALLATION_NAME
+          value: bkup
+        - name: WORKER_VALUES
+          value: |
+            resources:
+              requests:
+                cpu: 100m
+                memory: 128Mi
+                ephemeral-storage: 50Mi
+              limits:
+                cpu: 1000m
+                memory: 512Mi
+                ephemeral-storage: 2Gi
     - name: registry-auth-bkup
   serviceAccountName: bkup

templates_install/master.pod.latest.yaml

@@ -11,15 +11,24 @@ spec:
       imagePullPolicy: Always
       env:
         - name: CLUSTER_NAME
-          valueFrom:
-            secretKeyRef:
-              name: bkup-config
-              key: cluster-name
-              optional: false
+          value: ${CLUSTER_NAME}
         - name: NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: INSTALLATION_NAME
+          value: bkup
+        - name: WORKER_VALUES
+          value: |
+            resources:
+              requests:
+                cpu: 100m
+                memory: 128Mi
+                ephemeral-storage: 50Mi
+              limits:
+                cpu: 1000m
+                memory: 512Mi
+                ephemeral-storage: 2Gi
   imagePullSecrets:
     - name: registry-auth-bkup
   serviceAccountName: bkup