fix: update petimeter

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 }}

charts/petimeter/base/deployment_patch.yaml

@@ -16,4 +16,4 @@
   value:
     name: acl
     configMap:
-      name: petimeter-acl
+      name: prod-petimeter-acl

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

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": ""
 }

charts/petimeter/prod/default.env

@@ -0,0 +1,2 @@
+OICD_CLIENT_SECRET=kkrKo3mmmseMnorf9qw3eklefkoOKFNs
+SEQ_APIKEY=WmZplDeFoxIHpJQ5BiDk

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
+  - ../base

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": ""
 }

charts/petimeter/staging/default.env

@@ -0,0 +1,2 @@
+OICD_CLIENT_SECRET=kfngKJF9EKVBnnvgkdmPfs0qw3rmjslk
+SEQ_APIKEY=WmZplDeFoxIHpJQ5BiDk

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
+  - ../base

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:

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: