Include ace-ocm-addons version in ace-installer values

Signed-off-by: Tamal Saha <[email protected]>
appscode-cloud · Nov 14, 2023 · e987345 · e987345
1 parent 6be7501
commit e987345
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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             |                         | <code>oci://ghcr.io/appscode-charts</code>                                                                                                                                                                                                                                           |
 | helm.releases.ace.enabled                             |                         | <code>false</code>                                                                                                                                                                                                                                                                   |
 | helm.releases.ace.version                             |                         | <code>"v2023.11.14"</code>                                                                                                                                                                                                                                                           |
+| helm.releases.ace-ocm-addons.enabled                  |                         | <code>true</code>                                                                                                                                                                                                                                                                    |
+| helm.releases.ace-ocm-addons.version                  |                         | <code>"v2023.11.14"</code>                                                                                                                                                                                                                                                           |
 | helm.releases.cert-manager.enabled                    |                         | <code>true</code>                                                                                                                                                                                                                                                                    |
 | helm.releases.cert-manager.version                    |                         | <code>"v1.12.6"</code>                                                                                                                                                                                                                                                               |
 | helm.releases.cert-manager.values                     |                         | <code>{"installCRDs":true}</code>                                                                                                                                                                                                                                                    |

diff --git 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
@@ -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"