From a20a6cfa5cad48b2c1ea863cddf807d9f1d2b967 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Tue, 20 Feb 2024 10:23:15 +0100 Subject: [PATCH] fix: update sorcerer deploy manifests --- charts/sorcerer/base/deployment_patch.yaml | 3 +++ charts/sorcerer/base/kustomization.yaml | 2 -- charts/sorcerer/chart/values.yaml | 2 +- charts/sorcerer/prod/appsettings.json | 6 +++--- charts/sorcerer/prod/default.env | 1 + charts/sorcerer/prod/deployment_patch.yaml | 5 +++++ charts/sorcerer/prod/kustomization.yaml | 12 ++++++------ charts/sorcerer/staging/appsettings.json | 4 ++-- charts/sorcerer/staging/default.env | 1 + charts/sorcerer/staging/deployment_patch.yaml | 5 +++++ charts/sorcerer/staging/kustomization.yaml | 12 ++++++------ charts/sorcerer/values-prod.yaml | 2 -- charts/sorcerer/values-staging.yaml | 2 +- 13 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 charts/sorcerer/prod/default.env create mode 100644 charts/sorcerer/staging/default.env diff --git a/charts/sorcerer/base/deployment_patch.yaml b/charts/sorcerer/base/deployment_patch.yaml index 53a116df..c8368399 100644 --- a/charts/sorcerer/base/deployment_patch.yaml +++ b/charts/sorcerer/base/deployment_patch.yaml @@ -4,3 +4,6 @@ - op: replace path: /spec/template/spec/containers/0/readinessProbe/httpGet/path value: /healthz +- op: add + path: /spec/template/spec/containers/0/envFrom + value: [] diff --git a/charts/sorcerer/base/kustomization.yaml b/charts/sorcerer/base/kustomization.yaml index f31688a9..8d9edf71 100644 --- a/charts/sorcerer/base/kustomization.yaml +++ b/charts/sorcerer/base/kustomization.yaml @@ -1,12 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: sorcerer patchesJson6902: - target: version: v1 group: apps kind: Deployment - name: sorcerer path: deployment_patch.yaml resources: - _manifest.yaml diff --git a/charts/sorcerer/chart/values.yaml b/charts/sorcerer/chart/values.yaml index a3737074..19c8088a 100644 --- a/charts/sorcerer/chart/values.yaml +++ b/charts/sorcerer/chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: registry.gitlab.com/oceanbox/sorcerer - tag: latest + tag: v4.3.0 pullPolicy: IfNotPresent init: diff --git a/charts/sorcerer/prod/appsettings.json b/charts/sorcerer/prod/appsettings.json index a396d7d7..8a62cb79 100644 --- a/charts/sorcerer/prod/appsettings.json +++ b/charts/sorcerer/prod/appsettings.json @@ -2,7 +2,7 @@ "sso": { "cookieDomain": ".oceanbox.io", "signedOutRedirectUri": "https://idp.oceanbox.io/dex/static/logout.html", - "redis": "10.1.30.100:30379,user=default,password=ymL4dlOBvU", + "redis": "10.255.241.201:30379,user=default,password=secret", "appDomain": "atlantis", "dataProtectionKeys": "DataProtection-Keys" }, @@ -18,5 +18,5 @@ "archiveSvc": "https://archmeister.svc.oceanbox.io", "cacheDir": "/data/archives/cache", "logService" : "https://seq.oceanbox.io", - "logApiKey": "DkORuCih08QUGKVDNmwy" -} \ No newline at end of file + "logApiKey": "" +} diff --git a/charts/sorcerer/prod/default.env b/charts/sorcerer/prod/default.env new file mode 100644 index 00000000..662cabec --- /dev/null +++ b/charts/sorcerer/prod/default.env @@ -0,0 +1 @@ +SEQ_APIKEY=DkORuCih08QUGKVDNmwy diff --git a/charts/sorcerer/prod/deployment_patch.yaml b/charts/sorcerer/prod/deployment_patch.yaml index 18bba712..fb5ac9dc 100644 --- a/charts/sorcerer/prod/deployment_patch.yaml +++ b/charts/sorcerer/prod/deployment_patch.yaml @@ -11,4 +11,9 @@ value: name: ARCHMEISTER_AUTH value: "admin:en-to-tre-fire" +- op: add + path: /spec/template/spec/containers/0/envFrom/- + value: + secretRef: + name: prod-sorcerer-env diff --git a/charts/sorcerer/prod/kustomization.yaml b/charts/sorcerer/prod/kustomization.yaml index 2b9197ca..03633b72 100644 --- a/charts/sorcerer/prod/kustomization.yaml +++ b/charts/sorcerer/prod/kustomization.yaml @@ -1,17 +1,17 @@ -namePrefix: production- -namespace: sorcerer generatorOptions: disableNameSuffixHash: true secretGenerator: - - name: sorcerer-appsettings - files: - - appsettings.json +- name: prod-sorcerer-appsettings + files: + - appsettings.json +- name: prod-sorcerer-env + envs: + - default.env patchesJson6902: - target: group: apps version: v1 kind: Deployment - name: sorcerer path: deployment_patch.yaml bases: - ../base diff --git a/charts/sorcerer/staging/appsettings.json b/charts/sorcerer/staging/appsettings.json index 02b099d1..b5bf50d5 100644 --- a/charts/sorcerer/staging/appsettings.json +++ b/charts/sorcerer/staging/appsettings.json @@ -2,7 +2,7 @@ "sso": { "cookieDomain": ".oceanbox.io", "signedOutRedirectUri": "https://idp.oceanbox.io/dex/static/logout.html", - "redis": "10.1.8.60:30379,user=default,password=JICkoUKD0Y", + "redis": "10.255.241.201:31379,user=default,password=secret", "appDomain": "atlantis", "dataProtectionKeys": "DataProtection-Keys" }, @@ -22,5 +22,5 @@ "archiveSvc": "https://archmeister.dev.oceanbox.io", "cacheDir": "/data/archives/cache", "logService" : "https://seq.oceanbox.io", - "logApiKey": "DkORuCih08QUGKVDNmwy" + "logApiKey": "" } diff --git a/charts/sorcerer/staging/default.env b/charts/sorcerer/staging/default.env new file mode 100644 index 00000000..662cabec --- /dev/null +++ b/charts/sorcerer/staging/default.env @@ -0,0 +1 @@ +SEQ_APIKEY=DkORuCih08QUGKVDNmwy diff --git a/charts/sorcerer/staging/deployment_patch.yaml b/charts/sorcerer/staging/deployment_patch.yaml index 064c8f9d..c7981ac9 100644 --- a/charts/sorcerer/staging/deployment_patch.yaml +++ b/charts/sorcerer/staging/deployment_patch.yaml @@ -11,4 +11,9 @@ value: name: ARCHMEISTER_AUTH value: "admin:en-to-tre-fire" +- op: add + path: /spec/template/spec/containers/0/envFrom/- + value: + secretRef: + name: staging-sorcerer-env diff --git a/charts/sorcerer/staging/kustomization.yaml b/charts/sorcerer/staging/kustomization.yaml index fa58e81f..d7d3d866 100644 --- a/charts/sorcerer/staging/kustomization.yaml +++ b/charts/sorcerer/staging/kustomization.yaml @@ -1,17 +1,17 @@ -namePrefix: staging- -namespace: sorcerer generatorOptions: disableNameSuffixHash: true secretGenerator: - - name: sorcerer-appsettings - files: - - appsettings.json +- name: staging-sorcerer-appsettings + files: + - appsettings.json +- name: staging-sorcerer-env + envs: + - default.env patchesJson6902: - target: group: apps version: v1 kind: Deployment - name: sorcerer path: deployment_patch.yaml bases: - ../base diff --git a/charts/sorcerer/values-prod.yaml b/charts/sorcerer/values-prod.yaml index e9cc41e1..2cbefe1d 100644 --- a/charts/sorcerer/values-prod.yaml +++ b/charts/sorcerer/values-prod.yaml @@ -1,5 +1,3 @@ -fullnameOverride: "sorcerer" - ingress: annotations: cert-manager.io/cluster-issuer: letsencrypt-production diff --git a/charts/sorcerer/values-staging.yaml b/charts/sorcerer/values-staging.yaml index 96720cc3..86b902a2 100644 --- a/charts/sorcerer/values-staging.yaml +++ b/charts/sorcerer/values-staging.yaml @@ -1,5 +1,5 @@ image: - tag: latest + tag: bede7682-debug ingress: annotations: