@vaharoni/devops 1.3.1 → 1.3.2

package/dist/{chunk-UZAJJUGJ.js → chunk-JQGPJAPS.js}

@@ -1,6 +1,6 @@
 import {
   getConst
-} from "./chunk-6FEVIEFY.js";
+} from "./chunk-VZ6XNNUH.js";
 
 // src/app-support/crypto/aes.ts
 import crypto from "crypto";

package/dist/{chunk-QOZ6NZJC.js → chunk-STUOTOGE.js}

@@ -2,7 +2,7 @@ import {
   getConst,
   getImageData,
   globEnvYamlFiles
-} from "./chunk-6FEVIEFY.js";
+} from "./chunk-VZ6XNNUH.js";
 
 // src/cli/common.ts
 import chalk from "chalk";

package/dist/{chunk-6FEVIEFY.js → chunk-VZ6XNNUH.js}

@@ -10,7 +10,7 @@ var SUPPORTED_LANGUAGES = ["python", "node"];
 var constFileSchema = z.object({
   "project-name": z.string(),
   "registry-infra": z.enum(["digitalocean", "gcp", "harbor"]),
-  "use-image-pull-secret": z.boolean().optional(),
+  "image-pull-secret-name": z.string().optional(),
   "image-versions-to-keep": z.number().optional(),
   "registry-base-url": z.string(),
   "registry-image-path-prefix": z.string().optional(),

package/dist/devops.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 import {
   InternalToken
-} from "./chunk-UZAJJUGJ.js";
+} from "./chunk-JQGPJAPS.js";
 import {
   CLICommandParser,
   CommandExecutor,
@@ -24,7 +24,7 @@ import {
   printUsageAndExit,
   secretName,
   upsertConfigMapCommand
-} from "./chunk-QOZ6NZJC.js";
+} from "./chunk-STUOTOGE.js";
 import {
   IGNORED_PATHS,
   __export,
@@ -36,7 +36,7 @@ import {
   getWorkspace,
   globEnvYamlFiles,
   workspaceDirectoryForLanguage
-} from "./chunk-6FEVIEFY.js";
+} from "./chunk-VZ6XNNUH.js";
 
 // src/devops.ts
 import { globSync as globSync2 } from "glob";
@@ -386,8 +386,8 @@ function setWorkspaceScale(monorepoEnv, image2, workspaceName, replicaCount) {
   }
   const { scale: _scale, ...rest } = getImageConfigMap(monorepoEnv, image2);
   const parsedScale = deserializeImageConfigMapKey(monorepoEnv, image2, "scale");
-  const isApplicable2 = setK8sScale(monorepoEnv, workspaceName, replicaCount);
-  if (!isApplicable2) return;
+  const isApplicable = setK8sScale(monorepoEnv, workspaceName, replicaCount);
+  if (!isApplicable) return;
   updateImageConfigMap(monorepoEnv, image2, {
     ...rest,
     scale: JSON.stringify({
@@ -2068,18 +2068,15 @@ function run11(cmdObj) {
 var job = { oneLiner: oneLiner11, keyExamples: keyExamples11, run: run11 };
 
 // src/libs/registry/image-pull-secret.ts
-var SECRET_NAME = "external-registry-secret";
 var SOURCE_NAMESPACE = "default";
-function isApplicable() {
-  const useImagePullSecret = getConst("use-image-pull-secret");
-  if (!useImagePullSecret) {
-    return false;
-  }
-  return true;
+function getSecretName() {
+  const secretName2 = getConst("image-pull-secret-name");
+  return secretName2 || null;
 }
 function copyRegistrySecretToNamespace(monorepoEnv) {
-  if (!isApplicable()) return;
-  const cmd = kubectlCommand(`get secret ${SECRET_NAME} -o json`, {
+  const secretName2 = getSecretName();
+  if (!secretName2) return;
+  const cmd = kubectlCommand(`get secret ${secretName2} -o json`, {
     monorepoEnv,
     namespace: SOURCE_NAMESPACE
   });
@@ -2103,9 +2100,10 @@ function copyRegistrySecretToNamespace(monorepoEnv) {
   new CommandExecutor(copyCmd, { quiet: true }).exec();
 }
 function patchServiceAccountImagePullSecret(monorepoEnv) {
-  if (!isApplicable()) return;
+  const secretName2 = getSecretName();
+  if (!secretName2) return;
   const cmd = kubectlCommand(
-    `patch serviceaccount default -p '{"imagePullSecrets": [{"name": "${SECRET_NAME}"}]}'`,
+    `patch serviceaccount default -p '{"imagePullSecrets": [{"name": "${secretName2}"}]}'`,
     { monorepoEnv }
   );
   new CommandExecutor(cmd, { quiet: true }).exec();

package/dist/index.d.ts

@@ -5,7 +5,7 @@ type SupportedLanguages = typeof SUPPORTED_LANGUAGES[number];
 declare const constFileSchema: z.ZodObject<{
     "project-name": z.ZodString;
     "registry-infra": z.ZodEnum<["digitalocean", "gcp", "harbor"]>;
-    "use-image-pull-secret": z.ZodOptional<z.ZodBoolean>;
+    "image-pull-secret-name": z.ZodOptional<z.ZodString>;
     "image-versions-to-keep": z.ZodOptional<z.ZodNumber>;
     "registry-base-url": z.ZodString;
     "registry-image-path-prefix": z.ZodOptional<z.ZodString>;
@@ -19,7 +19,7 @@ declare const constFileSchema: z.ZodObject<{
     "registry-base-url": string;
     "extra-remote-environments": string[];
     "extra-local-environments": string[];
-    "use-image-pull-secret"?: boolean | undefined;
+    "image-pull-secret-name"?: string | undefined;
     "image-versions-to-keep"?: number | undefined;
     "registry-image-path-prefix"?: string | undefined;
     "cloudrun-artifact-registry-repo-path"?: string | undefined;
@@ -30,7 +30,7 @@ declare const constFileSchema: z.ZodObject<{
     "registry-base-url": string;
     "extra-remote-environments": string[];
     "extra-local-environments": string[];
-    "use-image-pull-secret"?: boolean | undefined;
+    "image-pull-secret-name"?: string | undefined;
     "image-versions-to-keep"?: number | undefined;
     "registry-image-path-prefix"?: string | undefined;
     "cloudrun-artifact-registry-repo-path"?: string | undefined;

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   InternalToken,
   decryptAes256Gcm,
   encryptAes256Gcm
-} from "./chunk-UZAJJUGJ.js";
+} from "./chunk-JQGPJAPS.js";
 import {
   SUPPORTED_LANGUAGES,
   constFileSchema,
@@ -10,7 +10,7 @@ import {
   packageFileNodeSchema,
   packageFilePythonSchema,
   workspaces
-} from "./chunk-6FEVIEFY.js";
+} from "./chunk-VZ6XNNUH.js";
 
 // src/app-support/discovery/dev-discovery-loader.ts
 var _portLookupByServiceName = null;

package/dist/plugins.js

@@ -5,8 +5,8 @@ import {
   kubectlCommand,
   pkgRoot,
   printUsageAndExit
-} from "./chunk-QOZ6NZJC.js";
-import "./chunk-6FEVIEFY.js";
+} from "./chunk-STUOTOGE.js";
+import "./chunk-VZ6XNNUH.js";
 
 // src/plugins.ts
 import path from "path";

package/dist/src/target-templates/infra-variants/hetzner/.devops/config/constants.yaml

@@ -4,9 +4,9 @@ project-name: $PROJECT_NAME
 # Registry infrastructure: digitalocean, gcp, or harbor
 registry-infra: harbor
 
-# When true, devops namespace create will copy external-registry-secret from default namespace
+# When set, devops namespace create will copy this secret from default namespace
 # and patch the default service account to use it. See docs/infra/RegistrySetup.md for details.
-use-image-pull-secret: true
+image-pull-secret-name: $PROJECT_NAME-registry-secret
 
 # Only relevant for Digital Ocean. Determines the number of versions to keep for each docker image.
 image-versions-to-keep: 5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vaharoni/devops",
   "type": "module",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Devops utility",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/libs/registry/image-pull-secret.ts

@@ -3,21 +3,18 @@ import { getConst } from "../config";
 import { envToNamespace } from "../k8s-constants";
 import { kubectlCommand } from "../k8s-helpers";
 
-const SECRET_NAME = "external-registry-secret";
 const SOURCE_NAMESPACE = "default";
 
-function isApplicable() {
-  const useImagePullSecret = getConst("use-image-pull-secret");
-  if (!useImagePullSecret) {
-    return false;
-  }
-  return true;
+function getSecretName(): string | null {
+  const secretName = getConst("image-pull-secret-name");
+  return secretName || null;
 }
 
 export function copyRegistrySecretToNamespace(monorepoEnv: string) {
-  if (!isApplicable()) return;
+  const secretName = getSecretName();
+  if (!secretName) return;
 
-  const cmd = kubectlCommand(`get secret ${SECRET_NAME} -o json`, {
+  const cmd = kubectlCommand(`get secret ${secretName} -o json`, {
     monorepoEnv,
     namespace: SOURCE_NAMESPACE,
   });
@@ -44,10 +41,11 @@ export function copyRegistrySecretToNamespace(monorepoEnv: string) {
 }
 
 export function patchServiceAccountImagePullSecret(monorepoEnv: string) {
-  if (!isApplicable()) return;
+  const secretName = getSecretName();
+  if (!secretName) return;
 
   const cmd = kubectlCommand(
-    `patch serviceaccount default -p '{"imagePullSecrets": [{"name": "${SECRET_NAME}"}]}'`,
+    `patch serviceaccount default -p '{"imagePullSecrets": [{"name": "${secretName}"}]}'`,
     { monorepoEnv }
   );
   new CommandExecutor(cmd, { quiet: true }).exec();

package/src/target-templates/infra-variants/hetzner/.devops/config/constants.yaml

@@ -4,9 +4,9 @@ project-name: $PROJECT_NAME
 # Registry infrastructure: digitalocean, gcp, or harbor
 registry-infra: harbor
 
-# When true, devops namespace create will copy external-registry-secret from default namespace
+# When set, devops namespace create will copy this secret from default namespace
 # and patch the default service account to use it. See docs/infra/RegistrySetup.md for details.
-use-image-pull-secret: true
+image-pull-secret-name: $PROJECT_NAME-registry-secret
 
 # Only relevant for Digital Ocean. Determines the number of versions to keep for each docker image.
 image-versions-to-keep: 5

package/src/types/index.ts

@@ -8,7 +8,7 @@ export type SupportedLanguages = typeof SUPPORTED_LANGUAGES[number];
 export const constFileSchema = z.object({
   "project-name": z.string(),
   "registry-infra": z.enum(["digitalocean", "gcp", "harbor"]),
-  "use-image-pull-secret": z.boolean().optional(),
+  "image-pull-secret-name": z.string().optional(),
   "image-versions-to-keep": z.number().optional(),
   "registry-base-url": z.string(),
   "registry-image-path-prefix": z.string().optional(),