@vaharoni/devops 1.0.52 → 1.1.1

package/dist/cli/registry.js

@@ -1,6 +1,6 @@
 import { getConst, getImageData } from "../libs/config";
 import { prune } from "../libs/digital-ocean/container-reg";
-import { containerRegistryPath, containerRegistryRepoName, containerRegistryRepoPath, } from "../libs/k8s-constants";
+import { containerRegistryPath, containerRegistryImageName, containerRegistryRepoPath, } from "../libs/k8s-constants";
 import { CLICommandParser, StrongParams, printUsageAndExit } from "./common";
 const oneLiner = "Manage container repositories";
 const keyExamples = `
@@ -36,7 +36,7 @@ const handlers = {
     },
     prune: (opts) => {
         const regName = containerRegistryPath();
-        const repoName = containerRegistryRepoName(opts.required("image"), opts.required("env"));
+        const repoName = containerRegistryImageName(opts.required("image"), opts.required("env"));
         prune(regName, repoName);
     },
 };

package/dist/libs/k8s-constants.d.ts

@@ -4,7 +4,7 @@ export declare function envToNamespace(monorepoEnv?: string): string;
 export declare function secretName(): string;
 export declare function imageDebugName(image: string): string;
 export declare function imageConfigMap(image: string): string;
-export declare function containerRegistryRepoName(image: string, monorepoEnv: string): string;
+export declare function containerRegistryImageName(image: string, monorepoEnv: string): string;
 export declare function containerRegistryPath(): string;
 export declare function containerRegistryRepoPath(image: string, monorepoEnv: string, gitSha: string): string;
 export declare function domainNameForEnv(image: string, monorepoEnv: string): string;

package/dist/libs/k8s-constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"k8s-constants.d.ts","sourceRoot":"","sources":["../../src/libs/k8s-constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB,6BAA6B,CAAA;AAoBlE,wBAAgB,gBAAgB,aAE/B;AAYD,wBAAgB,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,UAGlD;AAED,wBAAgB,UAAU,WAEzB;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,UAE3C;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,UAE3C;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAG3E;AAED,wBAAgB,qBAAqB,WAEpC;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,UAOf;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAIlE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,UAE9C"}
+{"version":3,"file":"k8s-constants.d.ts","sourceRoot":"","sources":["../../src/libs/k8s-constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB,6BAA6B,CAAA;AAoBlE,wBAAgB,gBAAgB,aAE/B;AAYD,wBAAgB,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,UAGlD;AAED,wBAAgB,UAAU,WAEzB;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,UAE3C;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,UAE3C;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAG5E;AAED,wBAAgB,qBAAqB,WAEpC;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,UAOf;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAIlE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,UAE9C"}

package/dist/libs/k8s-constants.js

@@ -42,19 +42,19 @@ export function imageDebugName(image) {
 export function imageConfigMap(image) {
     return `image-config-${image}`;
 }
-export function containerRegistryRepoName(image, monorepoEnv) {
+export function containerRegistryImageName(image, monorepoEnv) {
     validateEnv(monorepoEnv);
     return `${getConst("project-name")}-${monorepoEnv}-${image}`;
 }
 export function containerRegistryPath() {
-    return [getConst("registry-base-url"), getConst("registry-name")].join("/");
+    return [getConst("registry-base-url"), getConst("registry-image-path-prefix", { ignoreIfInvalid: true })].filter(Boolean).join("/");
 }
 export function containerRegistryRepoPath(image, monorepoEnv, gitSha) {
     return [
         getConst("registry-base-url"),
-        getConst("registry-name"),
-        [containerRegistryRepoName(image, monorepoEnv), gitSha].join(":"),
-    ].join("/");
+        getConst("registry-image-path-prefix", { ignoreIfInvalid: true }),
+        [containerRegistryImageName(image, monorepoEnv), gitSha].join(":"),
+    ].filter(Boolean).join("/");
 }
 export function domainNameForEnv(image, monorepoEnv) {
     const imageData = getImageData(image);

package/dist/types/index.d.ts

@@ -3,28 +3,28 @@ export declare const SUPPORTED_LANGUAGES: readonly ["python", "node"];
 export type SupportedLanguages = typeof SUPPORTED_LANGUAGES[number];
 export declare const constFileSchema: z.ZodObject<{
     "project-name": z.ZodString;
-    infra: z.ZodEnum<["hetzner", "digitalocean"]>;
-    "image-versions-to-keep": z.ZodNumber;
+    infra: z.ZodEnum<["hetzner", "digitalocean", "gcloud"]>;
+    "image-versions-to-keep": z.ZodOptional<z.ZodNumber>;
     "registry-base-url": z.ZodString;
-    "registry-name": z.ZodString;
+    "registry-image-path-prefix": z.ZodOptional<z.ZodString>;
     "extra-remote-environments": z.ZodArray<z.ZodString, "many">;
     "extra-local-environments": z.ZodArray<z.ZodString, "many">;
 }, "strip", z.ZodTypeAny, {
     "project-name": string;
-    infra: "hetzner" | "digitalocean";
-    "image-versions-to-keep": number;
+    infra: "hetzner" | "digitalocean" | "gcloud";
     "registry-base-url": string;
-    "registry-name": string;
     "extra-remote-environments": string[];
     "extra-local-environments": string[];
+    "image-versions-to-keep"?: number | undefined;
+    "registry-image-path-prefix"?: string | undefined;
 }, {
     "project-name": string;
-    infra: "hetzner" | "digitalocean";
-    "image-versions-to-keep": number;
+    infra: "hetzner" | "digitalocean" | "gcloud";
     "registry-base-url": string;
-    "registry-name": string;
     "extra-remote-environments": string[];
     "extra-local-environments": string[];
+    "image-versions-to-keep"?: number | undefined;
+    "registry-image-path-prefix"?: string | undefined;
 }>;
 export type ConstFileSchema = z.infer<typeof constFileSchema>;
 declare const singleTemplateSchema: z.ZodObject<{

package/dist/types/index.js

@@ -3,10 +3,10 @@ export const SUPPORTED_LANGUAGES = ["python", "node"];
 // Config files
 export const constFileSchema = z.object({
     "project-name": z.string(),
-    "infra": z.enum(["hetzner", "digitalocean"]),
-    "image-versions-to-keep": z.number(),
+    "infra": z.enum(["hetzner", "digitalocean", "gcloud"]),
+    "image-versions-to-keep": z.number().optional(),
     "registry-base-url": z.string(),
-    "registry-name": z.string(),
+    "registry-image-path-prefix": z.string().optional(),
     "extra-remote-environments": z.array(z.string()),
     "extra-local-environments": z.array(z.string()),
 });

package/package.json

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

package/src/cli/registry.ts

@@ -2,7 +2,7 @@ import { getConst, getImageData } from "../libs/config";
 import { prune } from "../libs/digital-ocean/container-reg";
 import {
   containerRegistryPath,
-  containerRegistryRepoName,
+  containerRegistryImageName,
   containerRegistryRepoPath,
 } from "../libs/k8s-constants";
 import { CLICommandParser, StrongParams, printUsageAndExit } from "./common";
@@ -49,7 +49,7 @@ const handlers = {
   },
   prune: (opts: StrongParams) => {
     const regName = containerRegistryPath();
-    const repoName = containerRegistryRepoName(
+    const repoName = containerRegistryImageName(
       opts.required("image"),
       opts.required("env")
     );

package/src/libs/k8s-constants.ts

@@ -51,13 +51,13 @@ export function imageConfigMap(image: string) {
   return `image-config-${image}`;
 }
 
-export function containerRegistryRepoName(image: string, monorepoEnv: string) {
+export function containerRegistryImageName(image: string, monorepoEnv: string) {
   validateEnv(monorepoEnv);
   return `${getConst("project-name")}-${monorepoEnv}-${image}`;
 }
 
 export function containerRegistryPath() {
-  return [getConst("registry-base-url"), getConst("registry-name")].join("/");
+  return [getConst("registry-base-url"), getConst("registry-image-path-prefix", { ignoreIfInvalid: true })].filter(Boolean).join("/");
 }
 
 export function containerRegistryRepoPath(
@@ -67,9 +67,9 @@ export function containerRegistryRepoPath(
 ) {
   return [
     getConst("registry-base-url"),
-    getConst("registry-name"),
-    [containerRegistryRepoName(image, monorepoEnv), gitSha].join(":"),
-  ].join("/");
+    getConst("registry-image-path-prefix", { ignoreIfInvalid: true }),
+    [containerRegistryImageName(image, monorepoEnv), gitSha].join(":"),
+  ].filter(Boolean).join("/");
 }
 
 export function domainNameForEnv(image: string, monorepoEnv: string) {

package/src/target-templates/.devops/config/constants.yaml

@@ -1,14 +1,15 @@
 # These will be used when generating kubernetes entities
 project-name: changeme
 
-# Supported: hetzner or digitalocean
+# Supported: hetzner, digitalocean, or gcloud
 infra: hetzner
 
 # Only relevant for Digital Ocean. Determines the number of versions to keep for each docker image.
 image-versions-to-keep: 5
 
 registry-base-url: registry.staging.com
-registry-name: changeme
+# What comes before <image-name>:<tag>. Can be empty.
+registry-image-path-prefix: changeme
 
 # production and staging are supported by default
 extra-remote-environments: []

package/src/target-templates/.devops/manifests/cron-jobs.yaml.hb

@@ -48,6 +48,7 @@ spec:
               resources:
                 requests:
                   memory: 250Mi
+                  cpu: 100m
           restartPolicy: Never
 {{#unless @last}}
 ---

package/src/target-templates/.devops/manifests/db-migrate-job.yaml.hb

@@ -37,6 +37,7 @@ spec:
           resources:
             requests:
               memory: 100Mi
+              cpu: 250m
       restartPolicy: Never
   backoffLimit: 0
   ttlSecondsAfterFinished: 3600

package/src/target-templates/.devops/manifests/deployment-debug.yaml.hb

@@ -42,3 +42,4 @@ spec:
           resources:
             requests:
               memory: 250Mi
+              cpu: 100m

package/src/target-templates/.devops/manifests/deployment-process.yaml.hb

@@ -45,3 +45,4 @@ spec:
           resources:
             requests:
               memory: 250Mi
+              cpu: 250m

package/src/target-templates/.devops/manifests/deployment-web.yaml.hb

@@ -51,3 +51,4 @@ spec:
           resources:
             requests:
               memory: 250Mi
+              cpu: 250m

package/src/target-templates/.devops/manifests/prefect.yaml.hb

@@ -56,6 +56,7 @@ spec:
           resources:
             requests:
               memory: 250Mi
+              cpu: 250m
 {{#unless @last}}
 ---
 {{/unless}}

package/src/target-templates/.github/actions/connect-to-gke@v1/action.yaml

@@ -0,0 +1,43 @@
+name: "Connect to Google Cloud GKE"
+description: "Sets up kubernetes connection to Google Cloud and ensures connection"
+inputs:
+  project_id:
+    description: "Google Cloud project ID"
+    required: true
+  zone:
+    description: "Google Cloud GKE zone (e.g., us-central1)"
+    required: true
+  cluster_name:
+    description: "Google Cloud GKE cluster name"
+    required: true
+  service_account_key:
+    description: "Google Cloud service account key in JSON format"
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Authenticate to Google Cloud
+      uses: google-github-actions/auth@v2
+      with:
+        project_id: ${{ inputs.project_id }}
+        credentials_json: ${{ inputs.service_account_key }}
+
+    - name: Install gcloud
+      uses: google-github-actions/setup-gcloud@v2
+      with:
+        project_id: ${{ inputs.project_id }}        
+
+    - name: Configure Docker auth
+      shell: bash
+      run: gcloud --quiet auth configure-docker 
+
+    - name: Fetch GKE credentials
+      uses: google-github-actions/get-gke-credentials@v2
+      with:
+        cluster_name: ${{ inputs.cluster_name }}
+        location: ${{ inputs.zone }}
+        project_id: ${{ inputs.project_id }}      
+
+    - name: verify namepsace exists
+      run: devops namespace check --env ${{ github.ref_name }}
+      shell: bash

package/src/target-templates/.github/actions/connect-to-infra@v1/action.yaml

@@ -16,6 +16,18 @@ inputs:
   harbor_password:
     description: "The password for the harbor registry"
     required: false
+  gcloud_project_id:
+    description: "Google Cloud project ID"
+    required: false
+  gcloud_zone:
+    description: "Google Cloud GKE zone (e.g., us-central1)"
+    required: false
+  gcloud_cluster_name:
+    description: "Google Cloud GKE cluster name"
+    required: false
+  service_account_key:
+    description: "Google Cloud service account key in JSON format"
+    required: false
 outputs:
   infra:
     description: "Which infrastructure is being used"
@@ -43,4 +55,13 @@ runs:
       with:
         kubeconfig: ${{ inputs.hetzner_kubeconfig }}
         harbor_user: ${{ inputs.harbor_user }}
-        harbor_password: ${{ inputs.harbor_password }}
+        harbor_password: ${{ inputs.harbor_password }}
+
+    - name: Connect to Google Cloud GKE
+      if: steps.determine_infrastructure.outputs.infra == 'gcloud'
+      uses: ./.github/actions/connect-to-gke@v1
+      with:
+        project_id: ${{ inputs.gcloud_project_id }}
+        zone: ${{ inputs.gcloud_zone }}
+        cluster_name: ${{ inputs.gcloud_cluster_name }}
+        service_account_key: ${{ inputs.service_account_key }}

package/src/target-templates/.github/workflows/k8s-build.yaml

@@ -37,6 +37,10 @@ jobs:
           hetzner_kubeconfig: ${{ secrets.HCLOUD_KUBECONFIG }}
           harbor_user: ${{ secrets.HARBOR_USER }}
           harbor_password: ${{ secrets.HARBOR_PASSWORD }}
+          gcloud_project_id: ${{ secrets.GCLOUD_PROJECT_ID }}
+          gcloud_zone: ${{ secrets.GCLOUD_ZONE }}
+          gcloud_cluster_name: ${{ secrets.GCLOUD_CLUSTER_NAME }}
+          service_account_key: ${{ secrets.GCLOUD_SA_KEY }}
 
       - name: Build image
         uses: ./.github/actions/build-image@v1
@@ -65,6 +69,10 @@ jobs:
           hetzner_kubeconfig: ${{ secrets.HCLOUD_KUBECONFIG }}
           harbor_user: ${{ secrets.HARBOR_USER }}
           harbor_password: ${{ secrets.HARBOR_PASSWORD }}
+          gcloud_project_id: ${{ secrets.GCLOUD_PROJECT_ID }}
+          gcloud_zone: ${{ secrets.GCLOUD_ZONE }}
+          gcloud_cluster_name: ${{ secrets.GCLOUD_CLUSTER_NAME }}
+          service_account_key: ${{ secrets.GCLOUD_SA_KEY }}
 
       - name: Run DB Migrate
         uses: ./.github/actions/db-migrate@v1

package/src/types/index.ts

@@ -7,10 +7,10 @@ export type SupportedLanguages = typeof SUPPORTED_LANGUAGES[number];
 
 export const constFileSchema = z.object({
   "project-name": z.string(),
-  "infra": z.enum(["hetzner", "digitalocean"]),
-  "image-versions-to-keep": z.number(),
+  "infra": z.enum(["hetzner", "digitalocean", "gcloud"]),
+  "image-versions-to-keep": z.number().optional(),
   "registry-base-url": z.string(),
-  "registry-name": z.string(),
+  "registry-image-path-prefix": z.string().optional(),
   "extra-remote-environments": z.array(z.string()),
   "extra-local-environments": z.array(z.string()),
 })