Add fleetshardSync.addonName helm value (#1636)

stackrox · Feb 5, 2024 · 6fe9aa3 · 6fe9aa3
1 parent 860a7ac
commit 6fe9aa3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/dp-terraform/helm/Dockerfile b/dp-terraform/helm/Dockerfile
@@ -29,6 +29,7 @@ RUN yq -i ".fleetshardSync.image.tag = strenv(FLEETSHARD_SYNC_IMAGE_TAG)" rhacs-
 FROM quay.io/operator-framework/helm-operator:v1.33.0
 
 ENV HOME=/opt/helm
+ENV ADDON_NAME=acs-fleetshard
 COPY watches.yaml ${HOME}/watches.yaml
 COPY --from=build ${HOME}/rhacs-terraform ${HOME}/rhacs-terraform
 WORKDIR ${HOME}
diff --git a/dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml b/dp-terraform/helm/rhacs-terraform/templates/fleetshard-sync.yaml
@@ -124,6 +124,8 @@ spec:
           value: {{ .Values.fleetshardSync.targetedOperatorUpgrades.enabled | quote }}
         - name: RHACS_ADDON_AUTO_UPGRADE
           value: {{ .Values.fleetshardSync.addonAutoUpgradeEnabled | quote }}
+        - name: FLEETSHARD_ADDON_NAME
+          value: {{ .Values.fleetshardSync.addonName | quote }}
         volumeMounts:
           - mountPath: /var/run/secrets/tokens
             name: aws-token

diff --git a/dp-terraform/helm/rhacs-terraform/values.yaml b/dp-terraform/helm/rhacs-terraform/values.yaml
@@ -62,6 +62,7 @@ fleetshardSync:
       operator: Exists
       effect: NoSchedule
   addonAutoUpgradeEnabled: true
+  addonName: acs-fleetshard
 
 acsOperator:
   enabled: false

diff --git a/dp-terraform/helm/watches.yaml b/dp-terraform/helm/watches.yaml
@@ -2,3 +2,5 @@
   version: v1alpha1
   kind: Fleetshard
   chart: rhacs-terraform
+  overrideValues:
+    fleetshardSync.addonName: $ADDON_NAME