From e987345d4ae0cf906bb99d852a1eb49ea4628a9d Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Tue, 14 Nov 2023 12:56:52 -0800 Subject: [PATCH] Include ace-ocm-addons version in ace-installer values Signed-off-by: Tamal Saha --- charts/ace-installer/README.md | 2 ++ .../templates/presets/bootstrap-presets.yaml | 8 ++++---- charts/ace-installer/values.yaml | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/charts/ace-installer/README.md b/charts/ace-installer/README.md index 502043c80..618429421 100644 --- a/charts/ace-installer/README.md +++ b/charts/ace-installer/README.md @@ -60,6 +60,8 @@ The following table lists the configurable parameters of the `ace-installer` cha | helm.repositories.appscode-charts-oci.url | | oci://ghcr.io/appscode-charts | | helm.releases.ace.enabled | | false | | helm.releases.ace.version | | "v2023.11.14" | +| helm.releases.ace-ocm-addons.enabled | | true | +| helm.releases.ace-ocm-addons.version | | "v2023.11.14" | | helm.releases.cert-manager.enabled | | true | | helm.releases.cert-manager.version | | "v1.12.6" | | helm.releases.cert-manager.values | | {"installCRDs":true} | diff --git a/charts/ace-installer/templates/presets/bootstrap-presets.yaml b/charts/ace-installer/templates/presets/bootstrap-presets.yaml index 6ee138581..c611beac1 100644 --- a/charts/ace-installer/templates/presets/bootstrap-presets.yaml +++ b/charts/ace-installer/templates/presets/bootstrap-presets.yaml @@ -8,21 +8,21 @@ ace: version: %q ace-installer: version: %q +ace-ocm-addons: + version: %q flux2: version: %q license-proxyserver: version: %q opscenter-features: version: %q -ace-ocm-addons: - version: %q ` (dig "ace" "version" .Chart.AppVersion $.Values.helm.releases) - .Chart.AppVersion + .Chart.Version + (dig "ace-ocm-addons" "version" .Chart.AppVersion $.Values.helm.releases) (dig "flux2" "version" "" $.Values.helm.releases) (dig "license-proxyserver" "version" .Chart.AppVersion $.Values.helm.releases) (dig "opscenter-features" "version" .Chart.AppVersion $.Values.helm.releases) - (dig "opscenter-features" "version" .Chart.AppVersion $.Values.helm.releases) | fromYaml }} {{ $_ := set $vals.helm "releases" $helmreleases }} diff --git a/charts/ace-installer/values.yaml b/charts/ace-installer/values.yaml index 67ae1212b..c1a8710bc 100644 --- a/charts/ace-installer/values.yaml +++ b/charts/ace-installer/values.yaml @@ -46,6 +46,9 @@ helm: ace: enabled: false version: "v2023.11.14" + ace-ocm-addons: + enabled: true + version: "v2023.11.14" cert-manager: enabled: true version: "v1.12.6"