Use eck-operator UBI image when ubiOnly=true. (#7486)

Ensure we use the `-ubi` operator image when `ubiOnly` is set to `true`. Update documentation for the ubi changes. --------- Signed-off-by: Michael Montgomery <mmontg1@gmail.com>
elastic · Jan 23, 2024 · bfae9f6 · bfae9f6
1 parent 849ce1e
commit bfae9f6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.buildkite/scripts/common/operator-image.sh b/.buildkite/scripts/common/operator-image.sh
@@ -50,12 +50,13 @@ operator::set_build_flavors_var() {
     if [[ "${BUILD_FLAVORS:-}" == "" ]]; then
         case $trigger in
             tag-*)           BUILD_FLAVORS="eck,eck-dev,eck-fips,eck-ubi,eck-ubi-fips" ;;
-            *-main)          BUILD_FLAVORS="eck,eck-dev" ;;
+            merge-main)      BUILD_FLAVORS="eck,eck-dev" ;;
+            nightly-main)    BUILD_FLAVORS="eck,eck-dev,eck-ubi" ;;
             *-test-snapshot) BUILD_FLAVORS="eck,eck-dev" ;;
             pr-*|merge-xyz)  BUILD_FLAVORS="eck" ;;
             dev)             BUILD_FLAVORS="dev" ;;
             *)               echo "error: trigger '$trigger' not supported"; exit ;;
         esac
     fi
     export BUILD_FLAVORS
-}
+}
diff --git a/deploy/eck-operator/templates/statefulset.yaml b/deploy/eck-operator/templates/statefulset.yaml
@@ -43,7 +43,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
-        - image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
+        - image: "{{ .Values.image.repository }}{{- if .Values.config.ubiOnly -}}-ubi{{- end -}}:{{ default .Chart.AppVersion .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           name: manager
           args:

diff --git a/deploy/eck-operator/values.yaml b/deploy/eck-operator/values.yaml
@@ -223,7 +223,7 @@ config:
   # Interval between observations of Elasticsearch health, non-positive values disable asynchronous observation.
   elasticsearchObservationInterval: 10s
 
-  # ubiOnly specifies whether the operator will use only UBI container images to deploy Elastic Stack applications. UBI images are only available from 7.10.0 onward.
+  # ubiOnly specifies whether the operator will use only UBI container images to deploy Elastic Stack applications as well as for its own StatefulSet image. UBI images are only available from 7.10.0 onward.
   # Cannot be combined with the containerSuffix value.
   ubiOnly: false