Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Jan 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ba074d
Use eck-operator UBI image when ubiOnly=true.
naemono Jan 18, 2024
63dc217
Also build UBI image on nightly-main.
naemono Jan 18, 2024
963db9a
Update wording in values.
naemono Jan 23, 2024
ac33375
Update cli flag as well.
naemono Jan 23, 2024
eb1e7e7
Update operator-config docs.
naemono Jan 23, 2024
364799f
Update wording.
naemono Jan 23, 2024
bb31799
remove the flag wording for ubi.
naemono Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .buildkite/scripts/common/operator-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
2 changes: 1 addition & 1 deletion deploy/eck-operator/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deploy/eck-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 its own deployment. UBI images are only available from 7.10.0 onward.
naemono marked this conversation as resolved.
Show resolved Hide resolved
# Cannot be combined with the containerSuffix value.
ubiOnly: false

Expand Down