File tree Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -64,7 +64,9 @@ PUSHGATEWAY_CHART_VERSION=3.4.0
64
64
PUSHGATEWAY_FULL_IMAGE = " quay.io/prometheus/pushgateway:v1.11.1"
65
65
66
66
# Prometheus Operator CRD
67
- PROM_OPERATOR_CRD_VERSION = v0.81.0
67
+ # #NOTE: PROM_OPERATOR_CRD_VERSION is now automatically
68
+ # # set to match the Prometheus Operator version.
69
+ # # However, it can still be set explicitly if need be.
68
70
69
71
# Tempo
70
72
TEMPO_CHART_REPO = grafana
Original file line number Diff line number Diff line change 78
78
79
79
# Generate yaml file with all container-related keys
80
80
generateImageKeysFile " $PROMOP_FULL_IMAGE " " monitoring/prom-operator_container_image.template"
81
+ if [ -z " $PROM_OPERATOR_CRD_VERSION " ]; then
82
+ log_debug " Setting PROM_OPERATOR_CRD_VERSION based on version [$VERSION ] extracted from PROMOP_FULL_IMAGE"
83
+ PROM_OPERATOR_CRD_VERSION=" $VERSION "
84
+ else
85
+ log_info " PROM_OPERATOR_CRD_VERSION has been explicitly set to [$PROM_OPERATOR_CRD_VERSION ]"
86
+ fi
81
87
generateImageKeysFile " $ALERTMANAGER_FULL_IMAGE " " $imageKeysFile " " ALERTMANAGER_"
82
88
generateImageKeysFile " $ADMWEBHOOK_FULL_IMAGE " " $imageKeysFile " " ADMWEBHOOK_"
83
89
generateImageKeysFile " $KSM_FULL_IMAGE " " $imageKeysFile " " KSM_"
You can’t perform that action at this time.
0 commit comments