@catladder/cli 1.2.0 → 1.4.0

package/package.json

@@ -16,7 +16,7 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@catladder/pipeline": "1.2.0",
+    "@catladder/pipeline": "1.4.0",
     "@kubernetes/client-node": "^0.16.2",
     "child-process-promise": "^2.2.1",
     "command-exists-promise": "^2.0.2",
@@ -54,5 +54,5 @@
     "eslint": "^8.7.0",
     "typescript": "^4.5.4"
   },
-  "version": "1.2.0"
+  "version": "1.4.0"
 }

package/src/apps/cli/commands/project/commandInitGitlab.ts

@@ -29,11 +29,7 @@ export default async (vorpal: Vorpal) =>
 
           await connectToCluster(fullName);
 
-          const namespace = getKubernetesNamespace(
-            context.fullConfig,
-            context.environment.shortName
-          );
-          await ensureNamespace(namespace);
+          const namespace = await ensureNamespace(context);
 
           //$.verbose = true;
 

package/src/apps/cli/commands/project/utils/ensureNamespace.ts

@@ -1,19 +1,55 @@
+import { Context, getKubernetesNamespace } from "@catladder/pipeline";
 import { V1Namespace, V1ObjectMeta } from "@kubernetes/client-node";
 import k8sApi from "../../../../../k8sApi";
 
-export default async function (namespace: string) {
+export default async function (context: Context) {
+  const namespace = getKubernetesNamespace(
+    context.fullConfig,
+    context.environment.shortName
+  );
+  const namespaceBody = new V1Namespace();
+  const metadata: V1ObjectMeta = {
+    name: namespace,
+    labels: {
+      customerName: context.fullConfig.customerName,
+      appName: context.fullConfig.appName,
+      environment: context.environment.shortName,
+      components: Object.keys(context.fullConfig.components).join("_"), // limited chars available...
+      buildTypes: Object.values(context.fullConfig.components)
+        .map((config) => config.build.type)
+        .join("_"), // limited chars available...
+      ...Object.fromEntries(
+        Object.entries(context.fullConfig.components).map(
+          ([componentName, config]) => [
+            "buildType_" + componentName,
+            config.build.type,
+          ]
+        )
+      ),
+      ...(context.fullConfig.meta?.labels ?? {}),
+    },
+  };
+
+  namespaceBody.metadata = metadata;
   try {
     await k8sApi.readNamespace(namespace);
+
+    await k8sApi.patchNamespace(
+      namespace,
+      namespaceBody,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      { headers: { "content-type": "application/merge-patch+json" } } // see https://github.com/kubernetes-client/javascript/issues/443
+    ); // update meta data
   } catch (e) {
     if (e.response?.body?.reason === "NotFound") {
-      const namespaceBody = new V1Namespace();
-      const metadata = {
-        name: namespace,
-      };
-      namespaceBody.metadata = metadata as V1ObjectMeta;
       await k8sApi.createNamespace(namespaceBody);
     } else {
+      console.error(e.response?.body);
       throw e;
     }
   }
+  return namespace;
 }

package/src/config/getProjectConfig.ts

@@ -93,7 +93,7 @@ const resolveSecrets = async (
 
   return Object.fromEntries(
     Object.entries(allEnvVars).map(([key, value]) => {
-      const isSecret = value?.startsWith?.("$CL_");
+      const isSecret = String(value)?.startsWith?.("$CL_");
       if (isSecret) {
         // secrets have CL_XXXX structure
         const found = allVariablesInGitlab.find((v) => "$" + v.key === value);