Skip to content

[FIX] Ensure PROM_OPERATOR_CRD_VERSION matches Prometheus Operator ve… #794

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

Merged
gsmith-sas merged 1 commit into from
Sep 11, 2025
Merged

[FIX] Ensure PROM_OPERATOR_CRD_VERSION matches Prometheus Operator ve… #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion component_versions.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ PUSHGATEWAY_CHART_VERSION=3.4.0
PUSHGATEWAY_FULL_IMAGE="quay.io/prometheus/pushgateway:v1.11.1"

#Prometheus Operator CRD
PROM_OPERATOR_CRD_VERSION=v0.81.0
##NOTE: PROM_OPERATOR_CRD_VERSION is now automatically
## set to match the Prometheus Operator version.
## However, it can still be set explicitly if need be.

#Tempo
TEMPO_CHART_REPO=grafana
Expand Down
6 changes: 6 additions & 0 deletions monitoring/bin/deploy_monitoring_cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ fi

#Generate yaml file with all container-related keys
generateImageKeysFile "$PROMOP_FULL_IMAGE" "monitoring/prom-operator_container_image.template"
if [ -z "$PROM_OPERATOR_CRD_VERSION" ]; then
log_debug "Setting PROM_OPERATOR_CRD_VERSION based on version [$VERSION] extracted from PROMOP_FULL_IMAGE"
PROM_OPERATOR_CRD_VERSION="$VERSION"
else
log_info "PROM_OPERATOR_CRD_VERSION has been explicitly set to [$PROM_OPERATOR_CRD_VERSION]"
fi
generateImageKeysFile "$ALERTMANAGER_FULL_IMAGE" "$imageKeysFile" "ALERTMANAGER_"
generateImageKeysFile "$ADMWEBHOOK_FULL_IMAGE" "$imageKeysFile" "ADMWEBHOOK_"
generateImageKeysFile "$KSM_FULL_IMAGE" "$imageKeysFile" "KSM_"
Expand Down