File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ variables:
1616 RESTORE_CACHE_ATTEMPTS : 3
1717 E2E_SHELL : sh
1818 E2E_ENV : kind
19- K8S_VERSION : " 1.22 "
19+ K8S_VERSION : " 1.24 "
2020 LATEST : " false"
2121 BUILD_UID : 0
2222
Original file line number Diff line number Diff line change @@ -40,9 +40,9 @@ check_grafana_secret() {
4040
4141check_exporter_queries () {
4242 local METRIC
43- for METRIC in $( yq -r ' keys[]' " $PROJECT_PATH " /stackgres-k8s/src/operator/src/main/resources/prometheus-postgres-exporter/queries.yaml)
43+ for METRIC in $( yq -r ' keys[]' " $PROJECT_PATH " /stackgres-k8s/src/operator/src/main/resources/prometheus-postgres-exporter/queries-1.22 .yaml)
4444 do
45- QUERY=" $( yq -r " .[\" $METRIC \" ].query" " $PROJECT_PATH " /stackgres-k8s/src/operator/src/main/resources/prometheus-postgres-exporter/queries.yaml) "
45+ QUERY=" $( yq -r " .[\" $METRIC \" ].query" " $PROJECT_PATH " /stackgres-k8s/src/operator/src/main/resources/prometheus-postgres-exporter/queries-1.22 .yaml) "
4646 if wait_until eval ' kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c postgres-util -- \
4747 psql -v ON_ERROR_STOP=ON -c "$QUERY" > /dev/null'
4848 then
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ e2e_test_uninstall() {
3838 if [ " $( echo " $K8S_VERSION " | tr . ' \n' | head -n 2 | xargs -I @ printf ' %05d' @) " \
3939 -lt " $( echo " 1.23" | tr . ' \n' | xargs -I @ printf ' %05d' @) " ]
4040 then
41+ echo " Skip $SPEC_NAME for Kubernetes older than 1.23"
4142 return
4243 fi
4344
Original file line number Diff line number Diff line change @@ -25,6 +25,13 @@ e2e_test_install() {
2525}
2626
2727e2e_test () {
28+ if [ " $( echo " $K8S_VERSION " | tr . ' \n' | head -n 2 | xargs -I @ printf ' %05d' @) " \
29+ -lt " $( echo " 1.24" | tr . ' \n' | xargs -I @ printf ' %05d' @) " ]
30+ then
31+ echo " Skip $SPEC_NAME for Kubernetes older than 1.24"
32+ return
33+ fi
34+
2835 run_test " Checking that stream is working" check_stream_is_working
2936}
3037
You can’t perform that action at this time.
0 commit comments