From 152c9eca4f634c7d6de7b651e538dff332822a60 Mon Sep 17 00:00:00 2001 From: Marc <7050295+marcleblanc2@users.noreply.github.com> Date: Tue, 25 Mar 2025 16:39:41 -0600 Subject: [PATCH 1/3] Fixing env var name for DEPLOY_TYPE --- components/patches/frontend-vars.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/patches/frontend-vars.yaml b/components/patches/frontend-vars.yaml index 2a9a7ff9..3bba379b 100644 --- a/components/patches/frontend-vars.yaml +++ b/components/patches/frontend-vars.yaml @@ -3,5 +3,5 @@ kind: ConfigMap metadata: name: sourcegraph-frontend-env data: - DEPLOY: kustomize + DEPLOY_TYPE: kustomize # Add env vars for frontend service below From b245a79ad33d4bfa3cf957b48e412068f44ea924 Mon Sep 17 00:00:00 2001 From: Marc <7050295+marcleblanc2@users.noreply.github.com> Date: Tue, 25 Mar 2025 17:00:50 -0600 Subject: [PATCH 2/3] Differentiate kustomize k3s vs k3s --- components/clusters/k3s/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/clusters/k3s/kustomization.yaml b/components/clusters/k3s/kustomization.yaml index 37a9a771..c36c49e9 100644 --- a/components/clusters/k3s/kustomization.yaml +++ b/components/clusters/k3s/kustomization.yaml @@ -10,4 +10,4 @@ configMapGenerator: - name: sourcegraph-frontend-env behavior: merge literals: - - DEPLOY_TYPE=k3s + - DEPLOY_TYPE=kustomize-k3s From f30ebbafdfecfee0d9ef3966fdccaf09efbc6fe4 Mon Sep 17 00:00:00 2001 From: Marc <7050295+marcleblanc2@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:29:41 -0600 Subject: [PATCH 3/3] Update kustomization.yaml The deployment repo / type is more the issue than the underlying Kubernetes platform --- components/clusters/k3s/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/clusters/k3s/kustomization.yaml b/components/clusters/k3s/kustomization.yaml index c36c49e9..9eba6868 100644 --- a/components/clusters/k3s/kustomization.yaml +++ b/components/clusters/k3s/kustomization.yaml @@ -10,4 +10,4 @@ configMapGenerator: - name: sourcegraph-frontend-env behavior: merge literals: - - DEPLOY_TYPE=kustomize-k3s + - DEPLOY_TYPE=kustomize