fix: misc fixes and simplifications for atlantis, sorcerer and plume

helmfile.d/atlantis.yaml.gotmpl

@@ -1,20 +1,17 @@
 bases:
  - ../envs/environments.yaml.gotmpl
 
-repositories:
+# repositories:
-- name: oceanbox
+# - name: oceanbox
-  url: "git+https://git:{{ requiredEnv "HELM_GIT_ACCESS_TOKEN" }}@gitlab.com/oceanbox/manifests@charts?ref=main"
+#   url: "git+https://git:{{ requiredEnv "HELM_GIT_ACCESS_TOKEN" }}@gitlab.com/oceanbox/manifests@charts?ref=main"
 
 commonLabels:
-  tier: system
+  tier: oceanbox
-
-apiVersions:
-- monitoring.coreos.com/v1
 
 releases:
 - name: {{ .Environment.Name }}-atlantis
   namespace: {{ .Environment.Name }}-atlantis
-  chart: oceanbox/atlantis
+  chart: ../charts/atlantis
   condition: atlantis.enabled
   values:
   - ../values/atlantis/values/values.yaml.gotmpl

helmfile.d/plume.yaml.gotmpl

@@ -2,7 +2,7 @@ bases:
  - ../envs/environments.yaml.gotmpl
 
 commonLabels:
-  tier: plume
+  tier: oceanbox
 
 releases:
 - name: plume

helmfile.d/sorcerer.yaml.gotmpl

@@ -1,15 +1,12 @@
 bases:
  - ../envs/environments.yaml.gotmpl
 
-repositories:
+# repositories:
-- name: oceanbox
+# - name: oceanbox
-  url: "git+https://git:{{ requiredEnv "HELM_GIT_ACCESS_TOKEN" }}@gitlab.com/oceanbox/manifests@charts?ref=main"
+#   url: "git+https://git:{{ requiredEnv "HELM_GIT_ACCESS_TOKEN" }}@gitlab.com/oceanbox/manifests@charts?ref=main"
 
 commonLabels:
-  tier: system
+  tier: oceanbox
-
-apiVersions:
-- monitoring.coreos.com/v1
 
 releases:
 - name: {{ .Environment.Name }}-sorcerer

values/atlantis/env-oceanbox.yaml.gotmpl

@@ -0,0 +1,3 @@
+atlantis:
+  enabled: true
+

values/atlantis/env.yaml.gotmpl

@@ -1,5 +1,5 @@
 atlantis:
-  enabled: true
+  enabled: false
-  autosync: true
+  autosync: {{ if eq .Environment.Name "prod" }} false {{ else }} true {{ end }}
   env: {{ .Environment.Name }}
 

values/atlantis/manifests/atlantis.yaml

@@ -70,7 +70,9 @@ spec:
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
-    # automated:
+    {{- if .Values.atlantis.autosync }}
-    #   prune: true
+    automated:
-    #   selfHeal: false
+      prune: true
+      selfHeal: false
+    {{- end }}
 {{- end }}

values/plume/env-ekman.yaml.gotmpl

@@ -1,4 +1,2 @@
 plume:
   enabled: true
-  envs:
-  - staging

values/plume/env-oceanbox.yaml.gotmpl

@@ -1,4 +0,0 @@
-plume:
-  enabled: true
-  envs:
-  - staging

values/plume/env.yaml.gotmpl

@@ -1,3 +1,5 @@
 plume:
-  enabled: false
+  enabled: true # for now
-  autosync: true
+  autosync: {{ if eq .Environment.Name "prod" }} false {{ else }} true {{ end }}
+  env: {{ .Environment.Name }}
+

values/plume/manifests/plume.yaml

@@ -1,9 +1,8 @@
 {{ if .Values.clusterConfig.argo.enabled }}
-{{- range .Values.plume.envs }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: {{ . }}-plume
+  name: {{ .Values.plume.env }}-plume
   namespace: argocd
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
@@ -11,28 +10,29 @@ metadata:
   - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
-    namespace: {{ . }}-plume
+    namespace: {{ .Values.plume.env }}-plume
     server: https://10.255.241.99:4443
   project: default
   sources:
-  - repoURL: https://gitlab.com/oceanbox/manifests.git
+  - repoURL: {{ .Values.clusterConfig.manifests }}
     targetRevision: HEAD
     path: helmfile.d
     plugin:
       name: helmfile-cmp
       env:
       - name: CLUSTER_NAME
-        value: {{ $.Values.clusterConfig.cluster }}
+        value: {{ .Values.clusterConfig.cluster }}
       - name: HELMFILE_ENVIRONMENT
-        value: {{ . }}
+        value: {{ .Values.plume.env }}
       - name: HELMFILE_FILE_PATH
         value: plume.yaml.gotmpl
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
-    # automated:
+    {{- if .Values.plume.autosync }}
-    #   prune: true
+    automated:
-    #   selfHeal: false
+      prune: true
-{{- end }}
+      selfHeal: false
+    {{- end }}
 {{- end }}

values/plume/values/values-staging.yaml

@@ -1,3 +1,6 @@
+image:
+  tag: replaceme
+
 ingress:
   enabled: true
   className: "nginx"

values/sorcerer/env-ekman.yapl.gotmpl

@@ -0,0 +1,3 @@
+sorcerer:
+  enabled: true
+

values/sorcerer/env.yaml.gotmpl

@@ -1,5 +1,5 @@
 sorcerer:
-  enabled: true
+  enabled: true # for now
-  autosync: false
+  autosync: {{ if eq .Environment.Name "prod" }} false {{ else }} true {{ end }}
   env: {{ .Environment.Name }}
 

values/sorcerer/manifests/sorcerer.yaml

@@ -46,7 +46,9 @@ spec:
     syncOptions:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
-    # automated:
+    {{- if .Values.sorcerer.autosync }}
-    #   prune: true
+    automated:
-    #   selfHeal: false
+      prune: true
+      selfHeal: false
+    {{- end }}
 {{- end }}