From 4b8905ec57bfa92666460d639840d7991c18990f Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 15 Feb 2024 20:01:42 +0100 Subject: [PATCH] fix: update petimeter --- applications/petimeter.yaml | 25 ++++++++++++++------- charts/petimeter/base/deployment_patch.yaml | 2 +- charts/petimeter/base/kustomization.yaml | 2 -- charts/petimeter/prod/appsettings.json | 6 ++--- charts/petimeter/prod/default.env | 2 ++ charts/petimeter/prod/kustomization.yaml | 13 ++++++----- charts/petimeter/staging/appsettings.json | 6 ++--- charts/petimeter/staging/default.env | 2 ++ charts/petimeter/staging/kustomization.yaml | 13 ++++++----- charts/petimeter/values-prod.yaml | 5 ++--- charts/petimeter/values-staging.yaml | 6 ++--- 11 files changed, 47 insertions(+), 35 deletions(-) create mode 100644 charts/petimeter/prod/default.env create mode 100644 charts/petimeter/staging/default.env diff --git a/applications/petimeter.yaml b/applications/petimeter.yaml index 887895d3..c54ceb11 100644 --- a/applications/petimeter.yaml +++ b/applications/petimeter.yaml @@ -4,34 +4,43 @@ metadata: name: petimeter namespace: argocd spec: + goTemplate: true generators: - list: elements: - cluster: https://kubernetes.default.svc env: prod hostname: petimeter.srv.oceanbox.io + autoSync: false + prune: true - cluster: https://staging-vcluster.staging-vcluster:443 env: staging hostname: petimeter.beta.oceanbox.io + autoSync: true + prune: true template: metadata: - name: '{{ env }}-petimeter' + name: '{{ .env }}-petimeter' spec: project: atlantis destination: namespace: atlantis - server: '{{ cluster }}' + server: '{{ .cluster }}' sources: - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: HEAD + targetRevision: dev path: charts/petimeter plugin: name: kustomize-helm-with-rewrite parameters: - name: env - string: '{{ env }}' + string: '{{ .env }}' - name: hostname - string: '{{ hostname }}' - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: HEAD - path: charts/petimeter/manifests + string: '{{ .hostname }}' + templatePatch: | + {{- if .autoSync }} + spec: + syncPolicy: + automated: + prune: {{ .prune }} + {{- end }} diff --git a/charts/petimeter/base/deployment_patch.yaml b/charts/petimeter/base/deployment_patch.yaml index cd93614f..20ecb37f 100644 --- a/charts/petimeter/base/deployment_patch.yaml +++ b/charts/petimeter/base/deployment_patch.yaml @@ -16,4 +16,4 @@ value: name: acl configMap: - name: petimeter-acl \ No newline at end of file + name: prod-petimeter-acl diff --git a/charts/petimeter/base/kustomization.yaml b/charts/petimeter/base/kustomization.yaml index 8af3f08f..5c9e9679 100644 --- a/charts/petimeter/base/kustomization.yaml +++ b/charts/petimeter/base/kustomization.yaml @@ -1,12 +1,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: oceanbox patches: - target: version: v1 group: apps kind: Deployment - name: petimeter path: deployment_patch.yaml resources: - _manifest.yaml diff --git a/charts/petimeter/prod/appsettings.json b/charts/petimeter/prod/appsettings.json index bda00b21..95144d05 100644 --- a/charts/petimeter/prod/appsettings.json +++ b/charts/petimeter/prod/appsettings.json @@ -7,7 +7,7 @@ "userinfo_endpoint": "https://idp.oceanbox.io/dex/userinfo", "device_authorization_endpoint": "https://idp.oceanbox.io/dex/device/code", "clientId": "petimeter", - "clientSecret": "kkrKo3mmmseMnorf9qw3eklefkoOKFNs", + "clientSecret": ", "scopes": [ "openid", "email", @@ -18,7 +18,7 @@ "sso": { "cookieDomain": ".oceanbox.io", "signedOutRedirectUri": "https://idp.oceanbox.io/dex/static/logout.html", - "redis": "redis-master.redis.svc,user=default,password=ymL4dlOBvU", + "redis": "redis-master.redis.svc,user=default,password=secret", "appDomain": "atlantis", "dataProtectionKeys": "DataProtection-Keys" }, @@ -27,5 +27,5 @@ "https://atlantis.srv.oceanbox.io" ], "logService" : "https://seq.oceanbox.io", - "logApiKey": "WmZplDeFoxIHpJQ5BiDk" + "logApiKey": "" } diff --git a/charts/petimeter/prod/default.env b/charts/petimeter/prod/default.env new file mode 100644 index 00000000..f90587b1 --- /dev/null +++ b/charts/petimeter/prod/default.env @@ -0,0 +1,2 @@ +OICD_CLIENT_SECRET=kkrKo3mmmseMnorf9qw3eklefkoOKFNs +SEQ_APIKEY=WmZplDeFoxIHpJQ5BiDk diff --git a/charts/petimeter/prod/kustomization.yaml b/charts/petimeter/prod/kustomization.yaml index 17efa1eb..1e81057a 100644 --- a/charts/petimeter/prod/kustomization.yaml +++ b/charts/petimeter/prod/kustomization.yaml @@ -1,11 +1,12 @@ -namePrefix: production- -namespace: oceanbox generatorOptions: disableNameSuffixHash: true secretGenerator: - - name: petimeter-appsettings - files: - - appsettings.json +- name: prod-petimeter-appsettings + files: + - appsettings.json +- name: prod-petimeter-env + envs: + - default.env patches: - target: group: apps @@ -14,4 +15,4 @@ patches: name: petimeter path: deployment_patch.yaml resources: - - ../base \ No newline at end of file + - ../base diff --git a/charts/petimeter/staging/appsettings.json b/charts/petimeter/staging/appsettings.json index e3ff8636..c308f272 100644 --- a/charts/petimeter/staging/appsettings.json +++ b/charts/petimeter/staging/appsettings.json @@ -7,7 +7,7 @@ "userinfo_endpoint": "https://idp.oceanbox.io/dex/userinfo", "device_authorization_endpoint": "https://idp.oceanbox.io/dex/device/code", "clientId": "petimeter_dev", - "clientSecret": "kfngKJF9EKVBnnvgkdmPfs0qw3rmjslk", + "clientSecret": "", "scopes": [ "openid", "email", @@ -18,7 +18,7 @@ "sso": { "cookieDomain": ".oceanbox.io", "signedOutRedirectUri": "https://idp.oceanbox.io/dex/static/logout.html", - "redis": "redis-master.redis.svc,user=default,password=JICkoUKD0Y", + "redis": "redis-master.redis.svc,user=default,password=secret", "appDomain": "atlantis", "dataProtectionKeys": "DataProtection-Keys" }, @@ -29,5 +29,5 @@ "https://atlantis.local.oceanbox.io:8080" ], "logService" : "https://seq.oceanbox.io", - "logApiKey": "WmZplDeFoxIHpJQ5BiDk" + "logApiKey": "" } diff --git a/charts/petimeter/staging/default.env b/charts/petimeter/staging/default.env new file mode 100644 index 00000000..3d46348c --- /dev/null +++ b/charts/petimeter/staging/default.env @@ -0,0 +1,2 @@ +OICD_CLIENT_SECRET=kfngKJF9EKVBnnvgkdmPfs0qw3rmjslk +SEQ_APIKEY=WmZplDeFoxIHpJQ5BiDk diff --git a/charts/petimeter/staging/kustomization.yaml b/charts/petimeter/staging/kustomization.yaml index 186b166c..f3d08741 100644 --- a/charts/petimeter/staging/kustomization.yaml +++ b/charts/petimeter/staging/kustomization.yaml @@ -1,11 +1,12 @@ -namePrefix: staging- -namespace: oceanbox generatorOptions: disableNameSuffixHash: true secretGenerator: - - name: petimeter-appsettings - files: - - appsettings.json +- name: staging-petimeter-appsettings + files: + - appsettings.json +- name: staging-petimeter-env + envs: + - default.env patches: - target: group: apps @@ -14,4 +15,4 @@ patches: name: petimeter path: deployment_patch.yaml resources: - - ../base \ No newline at end of file + - ../base diff --git a/charts/petimeter/values-prod.yaml b/charts/petimeter/values-prod.yaml index 59fee371..3511d6f7 100644 --- a/charts/petimeter/values-prod.yaml +++ b/charts/petimeter/values-prod.yaml @@ -1,11 +1,10 @@ -fullnameOverride: petimeter +image: + tag: latest ingress: annotations: cert-manager.io/cluster-issuer: letsencrypt-production nginx.ingress.kubernetes.io/proxy-buffer-size: 128k - # nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 - # nginx.ingress.kubernetes.io/whitelist-source-range: 0.0.0.0/0 hosts: - host: petimeter.srv.oceanbox.io paths: diff --git a/charts/petimeter/values-staging.yaml b/charts/petimeter/values-staging.yaml index 12377a43..2fae4132 100644 --- a/charts/petimeter/values-staging.yaml +++ b/charts/petimeter/values-staging.yaml @@ -1,11 +1,11 @@ -fullnameOverride: petimeter +image: + tag: latest ingress: annotations: cert-manager.io/cluster-issuer: letsencrypt-staging nginx.ingress.kubernetes.io/proxy-buffer-size: 128k - # nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 - # nginx.ingress.kubernetes.io/whitelist-source-range: 0.0.0.0/0 + # atlantis.oceanbox.io/expose: internal hosts: - host: petimeter.beta.oceanbox.io paths: