From 7270136647fb3b2c6e06551137e4203d2f1df641 Mon Sep 17 00:00:00 2001 From: Simen Kirkvik Date: Thu, 27 Nov 2025 08:57:16 +0100 Subject: [PATCH] Update bin/generate.sh to fit new values At least plume and sorcerer use these new ones --- bin/generate.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/generate.sh b/bin/generate.sh index 2f48fd7c..5c7058f6 100755 --- a/bin/generate.sh +++ b/bin/generate.sh @@ -18,21 +18,22 @@ releases: chart: ../charts/$name condition: $name.enabled values: - - ../values/$name/values/$name.yaml.gotmpl - - ../values/$name/values/$name-{{ .Environment.Name }}.yaml.gotmpl + - ../values/$name/values/values.yaml.gotmpl + - ../values/$name/values/values-{{ .Environment.Name }}.yaml postRenderer: ../bin/kustomizer postRendererArgs: - ../values/$name/kustomize/{{ .Environment.Name }} missingFileHandler: Info -- name: $name-manifests +- name: manifests namespace: {{ .Environment.Name }}-$name - chart: _$name-manifests + chart: manifests condition: $name.enabled missingFileHandler: Info values: - - ../values/values-{{ requiredEnv "CLUSTER_NAME" }}.yaml - - ../values/$name/values.yaml.gotmpl - - ../values/$name/values-{{ requiredEnv "CLUSTER_NAME" }}.yaml.gotmpl + - ../values/env.yaml + - ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml + - ../values/$name/env.yaml.gotmpl + - ../values/$name/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl hooks: - events: [ prepare, cleanup ] showlogs: true @@ -42,7 +43,7 @@ releases: - '{{\`{{ .Release.Chart }}\`}}' - '{{\`{{ .Environment.Name }}\`}}' - ../values/$name/manifests - - _$name-manifests + - manifests EOF }