fixup! fixup! Restore gc admin password after snapshot restore

Author: tomach

crate/operator/bootstrap.py

@@ -29,7 +29,12 @@
 from kubernetes_asyncio.stream import WsApiClient
 
 from crate.operator.config import config
-from crate.operator.constants import CONNECT_TIMEOUT, GC_USERNAME, SYSTEM_USERNAME
+from crate.operator.constants import (
+    CONNECT_TIMEOUT,
+    GC_USER_SECRET_NAME,
+    GC_USERNAME,
+    SYSTEM_USERNAME,
+)
 from crate.operator.cratedb import create_user, get_connection
 from crate.operator.utils import crate
 from crate.operator.utils.k8s_api_client import GlobalApiClient
@@ -205,7 +210,9 @@ async def bootstrap_gc_admin_user(core: CoreV1Api, namespace: str, name: str):
     async with get_connection(host, password, timeout=CONNECT_TIMEOUT) as conn:
         async with conn.cursor() as cursor:
             password = await resolve_secret_key_ref(
-                core, namespace, {"key": "password", "name": f"user-gc-{name}"}
+                core,
+                namespace,
+                {"key": "password", "name": GC_USER_SECRET_NAME.format(name=name)},
             )
             await create_user(cursor, namespace, name, GC_USERNAME, password)
 

crate/operator/constants.py

@@ -34,6 +34,7 @@
 
 SYSTEM_USERNAME = "system"
 GC_USERNAME = "gc_admin"
+GC_USER_SECRET_NAME = "user-gc-{name}"
 
 CONNECT_TIMEOUT = 10.0
 

crate/operator/create.py

@@ -95,6 +95,7 @@
     DCUTIL_BINARY,
     DCUTIL_CHECKSUM,
     DECOMMISSION_TIMEOUT,
+    GC_USER_SECRET_NAME,
     LABEL_COMPONENT,
     LABEL_MANAGED_BY,
     LABEL_NAME,
@@ -1217,7 +1218,7 @@ def get_gc_user_secret(
     return V1Secret(
         data={"password": b64encode(gen_password(50))},
         metadata=V1ObjectMeta(
-            name=f"user-gc-{name}",
+            name=GC_USER_SECRET_NAME.format(name=name),
             labels=labels,
             owner_references=owner_references,
         ),

crate/operator/grand_central.py

@@ -67,6 +67,7 @@
 from crate.operator.bootstrap import bootstrap_gc_admin_user
 from crate.operator.config import config
 from crate.operator.constants import (
+    GC_USER_SECRET_NAME,
     GC_USERNAME,
     GRAND_CENTRAL_BACKEND_API_PORT,
     GRAND_CENTRAL_INIT_CONTAINER,
@@ -133,7 +134,7 @@ def get_grand_central_deployment(
             name="GRAND_CENTRAL_CRATEDB_PASSWORD",
             value_from=V1EnvVarSource(
                 secret_key_ref=V1SecretKeySelector(
-                    key="password", name=f"user-gc-{name}"
+                    key="password", name=GC_USER_SECRET_NAME.format(name=name)
                 ),
             ),
         ),

crate/operator/utils/kubeapi.py

@@ -32,7 +32,12 @@
 )
 
 from crate.operator.config import config
-from crate.operator.constants import API_GROUP, LABEL_USER_PASSWORD, RESOURCE_CRATEDB
+from crate.operator.constants import (
+    API_GROUP,
+    GC_USER_SECRET_NAME,
+    LABEL_USER_PASSWORD,
+    RESOURCE_CRATEDB,
+)
 from crate.operator.utils.formatting import b64decode
 from crate.operator.utils.k8s_api_client import GlobalApiClient
 from crate.operator.utils.typing import K8sModel, SecretKeyRef
@@ -247,5 +252,7 @@ async def get_gc_user_password(core: CoreV1Api, namespace: str, name: str) -> st
     :param name: The name of the CrateDB cluster.
     """
     return await resolve_secret_key_ref(
-        core, namespace, {"key": "password", "name": f"user-gc-{name}"}
+        core,
+        namespace,
+        {"key": "password", "name": GC_USER_SECRET_NAME.format(name=name)},
     )

tests/test_create_grand_central.py

@@ -30,6 +30,7 @@
 
 from crate.operator.constants import (
     API_GROUP,
+    GC_USER_SECRET_NAME,
     GC_USERNAME,
     GRAND_CENTRAL_PROMETHEUS_PORT,
     GRAND_CENTRAL_RESOURCE_PREFIX,
@@ -200,10 +201,14 @@ async def test_create_grand_central(faker, namespace, kopf_runner, api_client):
         does_secret_exist,
         core,
         namespace.metadata.name,
-        f"user-gc-{name}",
+        GC_USER_SECRET_NAME.format(name=name),
     )
     secrets = (await core.list_namespaced_secret(namespace.metadata.name)).items
-    secret_pw = next(filter(lambda x: x.metadata.name == f"user-gc-{name}", secrets))
+    secret_pw = next(
+        filter(
+            lambda x: x.metadata.name == GC_USER_SECRET_NAME.format(name=name), secrets
+        )
+    )
 
     gc_admin_pw = b64decode(secret_pw.data["password"])