From 32a75ffc564ff48ba91a263ee76795839b5f268a Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Sat, 21 Jun 2025 18:00:19 +0200 Subject: [PATCH] fix: simplify helmfile manifest charts a bit --- helmfile.d/argo.yaml.gotmpl | 2 +- helmfile.d/atlantis.yaml.gotmpl | 2 +- helmfile.d/cert-manager.yaml.gotmpl | 6 +++--- helmfile.d/cilium.yaml.gotmpl | 12 ++++++------ helmfile.d/dapr.yaml.gotmpl | 6 +++--- helmfile.d/ingress-nginx.yaml.gotmpl | 6 +++--- helmfile.d/kyverno.yaml.gotmpl | 6 +++--- helmfile.d/metrics-server.yaml.gotmpl | 6 +++--- helmfile.d/nfs-provisioner.yaml.gotmpl | 6 +++--- helmfile.d/plume.yaml.gotmpl | 6 +++--- helmfile.d/postgres-operator.yaml.gotmpl | 6 +++--- helmfile.d/prometheus.yaml.gotmpl | 6 +++--- helmfile.d/system.yaml.gotmpl | 12 ++++++------ helmfile.d/velero.yaml.gotmpl | 6 +++--- helmfile.d/x509-exporter.yaml.gotmpl | 6 +++--- values/atlantis/base | 1 - values/atlantis/chart | 1 - values/atlantis/prod | 1 - values/atlantis/staging | 1 - values/atlantis/values-prod.yaml | 1 - values/atlantis/values-staging.yaml | 1 - values/atlantis/values.yaml | 1 - 22 files changed, 47 insertions(+), 54 deletions(-) delete mode 120000 values/atlantis/base delete mode 120000 values/atlantis/chart delete mode 120000 values/atlantis/prod delete mode 120000 values/atlantis/staging delete mode 120000 values/atlantis/values-prod.yaml delete mode 120000 values/atlantis/values-staging.yaml delete mode 120000 values/atlantis/values.yaml diff --git a/helmfile.d/argo.yaml.gotmpl b/helmfile.d/argo.yaml.gotmpl index ee55be26..41f4f13d 100644 --- a/helmfile.d/argo.yaml.gotmpl +++ b/helmfile.d/argo.yaml.gotmpl @@ -46,7 +46,7 @@ releases: version: 0.45.0 condition: argo.workflows.enabled missingFileHandler: Info -- name: argo-manifests +- name: manifests namespace: argocd chart: _argo condition: argo.enabled diff --git a/helmfile.d/atlantis.yaml.gotmpl b/helmfile.d/atlantis.yaml.gotmpl index b9591abd..d59afe3b 100644 --- a/helmfile.d/atlantis.yaml.gotmpl +++ b/helmfile.d/atlantis.yaml.gotmpl @@ -23,7 +23,7 @@ releases: postRendererArgs: - ../values/atlantis/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: atlantis-manifests +- name: manifests namespace: {{ .Environment.Name }}-atlantis chart: manifests condition: atlantis.enabled diff --git a/helmfile.d/cert-manager.yaml.gotmpl b/helmfile.d/cert-manager.yaml.gotmpl index d74d6dee..ef757def 100644 --- a/helmfile.d/cert-manager.yaml.gotmpl +++ b/helmfile.d/cert-manager.yaml.gotmpl @@ -21,9 +21,9 @@ releases: postRendererArgs: - ../values/cert-manager/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: cert-manager-manifests +- name: manifests namespace: cert-manager - chart: _cert-manager-manifests + chart: manifests condition: cert_manager.enabled missingFileHandler: Info values: @@ -40,4 +40,4 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/cert-manager/manifests - - _cert-manager-manifests + - manifests diff --git a/helmfile.d/cilium.yaml.gotmpl b/helmfile.d/cilium.yaml.gotmpl index 2b16f86a..baaca2b4 100644 --- a/helmfile.d/cilium.yaml.gotmpl +++ b/helmfile.d/cilium.yaml.gotmpl @@ -21,9 +21,9 @@ releases: - ../values/cilium/values/cilium.yaml.gotmpl - ../values/cilium/values/cilium-{{ .Environment.Name }}.yaml.gotmpl missingFileHandler: Info -- name: spire-manifests +- name: manifests namespace: cilium - chart: _sprire-manifests + chart: manifests condition: cilium.spire.enabled hooks: - events: [ prepare, cleanup ] @@ -34,10 +34,10 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/cilium/spire-manifests - - _spire-manifests -- name: cilium-manifests + - manifests +- name: manifests namespace: cilium - chart: _cilium-manifests + chart: manifests condition: cilium.enabled missingFileHandler: Info values: @@ -54,5 +54,5 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/cilium/cilium-manifests - - _cilium-manifests + - manifests diff --git a/helmfile.d/dapr.yaml.gotmpl b/helmfile.d/dapr.yaml.gotmpl index f51caa11..5e703bf2 100644 --- a/helmfile.d/dapr.yaml.gotmpl +++ b/helmfile.d/dapr.yaml.gotmpl @@ -9,9 +9,9 @@ commonLabels: tier: system releases: -- name: dapr-manifests +- name: manifests namespace: dapr-system - chart: _dapr-manifests + chart: manifests condition: nginx.enabled missingFileHandler: Info values: @@ -28,4 +28,4 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/dapr/manifests - - _dapr-manifests + - manifests diff --git a/helmfile.d/ingress-nginx.yaml.gotmpl b/helmfile.d/ingress-nginx.yaml.gotmpl index 04f6a358..f637c3ba 100644 --- a/helmfile.d/ingress-nginx.yaml.gotmpl +++ b/helmfile.d/ingress-nginx.yaml.gotmpl @@ -21,9 +21,9 @@ releases: postRendererArgs: - ../values/ingress-nginx/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: ingress-nginx-manifests +- name: manifests namespace: ingress-nginx - chart: _ingress-nginx-manifests + chart: manifests condition: nginx.enabled missingFileHandler: Info values: @@ -40,4 +40,4 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/ingress-nginx/manifests - - _ingress-nginx-manifests + - manifests diff --git a/helmfile.d/kyverno.yaml.gotmpl b/helmfile.d/kyverno.yaml.gotmpl index 659ff2c5..dd585d39 100644 --- a/helmfile.d/kyverno.yaml.gotmpl +++ b/helmfile.d/kyverno.yaml.gotmpl @@ -24,9 +24,9 @@ releases: postRendererArgs: - ../values/kyverno/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: kyverno-manifests +- name: manifests namespace: kyverno - chart: _kyverno-manifests + chart: manifests condition: kyverno.enabled missingFileHandler: Info values: @@ -43,5 +43,5 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/kyverno/manifests - - _kyverno-manifests + - manifests diff --git a/helmfile.d/metrics-server.yaml.gotmpl b/helmfile.d/metrics-server.yaml.gotmpl index 433ab359..d19a205a 100644 --- a/helmfile.d/metrics-server.yaml.gotmpl +++ b/helmfile.d/metrics-server.yaml.gotmpl @@ -21,9 +21,9 @@ releases: postRendererArgs: - ../values/metrics-server/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: metrics-server-manifests +- name: manifests namespace: kube-system - chart: _metrics-server-manifests + chart: manifests condition: metrics_server.enabled missingFileHandler: Info values: @@ -40,4 +40,4 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/metrics-server/manifests - - _metrics-server-manifests + - manifests diff --git a/helmfile.d/nfs-provisioner.yaml.gotmpl b/helmfile.d/nfs-provisioner.yaml.gotmpl index 67724fdd..17201b33 100644 --- a/helmfile.d/nfs-provisioner.yaml.gotmpl +++ b/helmfile.d/nfs-provisioner.yaml.gotmpl @@ -21,9 +21,9 @@ releases: postRendererArgs: - ../values/nfs-provisioner/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: nfs-provisioner-manifests +- name: manifests namespace: kube-system - chart: _nfs-provisioner-manifests + chart: manifests condition: nfs_provisioner.enabled missingFileHandler: Info values: @@ -40,4 +40,4 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/nfs-provisioner/manifests - - _nfs-provisioner-manifests + - manifests diff --git a/helmfile.d/plume.yaml.gotmpl b/helmfile.d/plume.yaml.gotmpl index 0ab04211..0cedd550 100644 --- a/helmfile.d/plume.yaml.gotmpl +++ b/helmfile.d/plume.yaml.gotmpl @@ -16,9 +16,9 @@ releases: postRendererArgs: - ../values/plume/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: plume-manifests +- name: manifests namespace: {{ .Environment.Name }}-plume - chart: _plume-manifests + chart: manifests condition: plume.enabled missingFileHandler: Info values: @@ -35,4 +35,4 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/plume/manifests - - _plume-manifests + - manifests diff --git a/helmfile.d/postgres-operator.yaml.gotmpl b/helmfile.d/postgres-operator.yaml.gotmpl index 2b5c128a..cd72d701 100644 --- a/helmfile.d/postgres-operator.yaml.gotmpl +++ b/helmfile.d/postgres-operator.yaml.gotmpl @@ -24,9 +24,9 @@ releases: postRendererArgs: - ../values/postgres-operator/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: postgres-operator-manifests +- name: manifests namespace: cnpg - chart: _postgres-operator-manifests + chart: manifests condition: postgres_operator.enabled missingFileHandler: Info values: @@ -43,4 +43,4 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/postgres-operator/manifests - - _postgres-operator-manifests + - manifests diff --git a/helmfile.d/prometheus.yaml.gotmpl b/helmfile.d/prometheus.yaml.gotmpl index bf0bcc70..e6decb76 100644 --- a/helmfile.d/prometheus.yaml.gotmpl +++ b/helmfile.d/prometheus.yaml.gotmpl @@ -21,9 +21,9 @@ releases: - ../values/prometheus/values/prometheus.yaml.gotmpl - ../values/prometheus/values/prometheus-{{ .Environment.Name }}.yaml.gotmpl missingFileHandler: Info -- name: prometheus-manifests +- name: manifests namespace: prometheus - chart: _prometheus-manifests + chart: manifests condition: prometheus.enabled missingFileHandler: Info values: @@ -40,5 +40,5 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/prometheus/manifests - - _prometheus-manifests + - manifests diff --git a/helmfile.d/system.yaml.gotmpl b/helmfile.d/system.yaml.gotmpl index 38dc9f77..f1e5b046 100644 --- a/helmfile.d/system.yaml.gotmpl +++ b/helmfile.d/system.yaml.gotmpl @@ -5,9 +5,9 @@ commonLabels: tier: system releases: -- name: common-system-manifests +- name: manifests namespace: kube-system - chart: _common-system-manifests + chart: manifests missingFileHandler: Info values: - ../values/env.yaml @@ -23,10 +23,10 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/system/manifests - - _common-system-manifests -- name: system-manifests + - manifests +- name: manifests namespace: kube-system - chart: _system-manifests + chart: manifests missingFileHandler: Info values: - ../values/env.yaml @@ -42,5 +42,5 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/system/{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }} - - _system-manifests + - manifests diff --git a/helmfile.d/velero.yaml.gotmpl b/helmfile.d/velero.yaml.gotmpl index d0a0c2a3..db77ee79 100644 --- a/helmfile.d/velero.yaml.gotmpl +++ b/helmfile.d/velero.yaml.gotmpl @@ -24,9 +24,9 @@ releases: postRendererArgs: - ../values/velero/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: velero-manifests +- name: manifests namespace: velero - chart: _velero-manifests + chart: manifests condition: velero.enabled missingFileHandler: Info values: @@ -43,4 +43,4 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/velero/manifests - - _velero-manifests + - manifests diff --git a/helmfile.d/x509-exporter.yaml.gotmpl b/helmfile.d/x509-exporter.yaml.gotmpl index 902c8812..4bbd1bc4 100644 --- a/helmfile.d/x509-exporter.yaml.gotmpl +++ b/helmfile.d/x509-exporter.yaml.gotmpl @@ -21,9 +21,9 @@ releases: postRendererArgs: - ../values/x509-exporter/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: x509-exporter-manifests +- name: manifests namespace: x509-exporter - chart: _x509-exporter-manifests + chart: manifests condition: x509_exporter.enabled missingFileHandler: Info values: @@ -40,4 +40,4 @@ releases: - '{{`{{ .Release.Chart }}`}}' - '{{`{{ .Environment.Name }}`}}' - ../values/x509-exporter/manifests - - _x509-exporter-manifests + - manifests diff --git a/values/atlantis/base b/values/atlantis/base deleted file mode 120000 index 72e021f3..00000000 --- a/values/atlantis/base +++ /dev/null @@ -1 +0,0 @@ -kustomize/base \ No newline at end of file diff --git a/values/atlantis/chart b/values/atlantis/chart deleted file mode 120000 index f0d03fc1..00000000 --- a/values/atlantis/chart +++ /dev/null @@ -1 +0,0 @@ -../../charts/atlantis \ No newline at end of file diff --git a/values/atlantis/prod b/values/atlantis/prod deleted file mode 120000 index 9d08ed93..00000000 --- a/values/atlantis/prod +++ /dev/null @@ -1 +0,0 @@ -kustomize/prod \ No newline at end of file diff --git a/values/atlantis/staging b/values/atlantis/staging deleted file mode 120000 index 7f7acb33..00000000 --- a/values/atlantis/staging +++ /dev/null @@ -1 +0,0 @@ -kustomize/staging \ No newline at end of file diff --git a/values/atlantis/values-prod.yaml b/values/atlantis/values-prod.yaml deleted file mode 120000 index 7631798a..00000000 --- a/values/atlantis/values-prod.yaml +++ /dev/null @@ -1 +0,0 @@ -values/values-prod.yaml.gotmpl \ No newline at end of file diff --git a/values/atlantis/values-staging.yaml b/values/atlantis/values-staging.yaml deleted file mode 120000 index 425b92d8..00000000 --- a/values/atlantis/values-staging.yaml +++ /dev/null @@ -1 +0,0 @@ -values/values-staging.yaml.gotmpl \ No newline at end of file diff --git a/values/atlantis/values.yaml b/values/atlantis/values.yaml deleted file mode 120000 index 012c24b2..00000000 --- a/values/atlantis/values.yaml +++ /dev/null @@ -1 +0,0 @@ -values/values.yaml.gotmpl \ No newline at end of file