Skip to content

Commit 167ebb4

Browse files
committed
version: 1.13.0-SNAPSHOT
1 parent a67d51c commit 167ebb4

168 files changed

Lines changed: 1526 additions & 216 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

stackgres-k8s/e2e/spec/operator-helm

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ e2e_test() {
2424
run_test "Check that operator can not be upgrade from an alpha version" check_operator_upgrade_alpha
2525
run_test "Check that operator can not be upgrade from a beta version" check_operator_upgrade_beta
2626
run_test "Check that operator can not be upgrade from version 0.9.5" check_operator_upgrade_0_9_5
27-
run_test "Check that operator can be upgrade from version 1.10.0" check_operator_upgrade_1_10_0
2827
run_test "Check that operator can be upgrade from version 1.11.0" check_operator_upgrade_1_11_0
28+
run_test "Check that operator can be upgrade from version 1.12.0" check_operator_upgrade_1_12_0
2929
run_test "Check that operator can not be upgrade with an SGCluster that uses version 0.9.5" check_operator_upgrade_with_cluster_using_0_9_5
30-
run_test "Check that operator can be upgrade with an SGCluster that uses version 1.10.0 and 1.11.0" check_operator_upgrade_with_cluster_using_1_10_0_and_1_11_0
30+
run_test "Check that operator can be upgrade with an SGCluster that uses version 1.11.0 and 1.12.0" check_operator_upgrade_with_cluster_using_1_11_0_and_1_12_0
3131
run_test "Check that operator can be deleted" check_operator_delete
3232
run_test "Check that operator can be installed from outside" check_operator_install_outside
3333
run_test "Check that operator can be installed with load balancer" check_operator_install_load_balancer
@@ -168,17 +168,17 @@ check_operator_upgrade_0_9_5() {
168168
fi
169169
}
170170

171-
check_operator_upgrade_1_10_0() {
172-
local PREVIOUS_VERSION=1.10.0
171+
check_operator_upgrade_1_12_0() {
172+
local PREVIOUS_VERSION=1.12.0
173173
kubectl label deployment -n "$OPERATOR_NAMESPACE" stackgres-operator \
174174
--overwrite "version=$PREVIOUS_VERSION"
175175
local EXIT_CODE RESULT
176176
try_function upgrade_operator
177177
if "$RESULT"
178178
then
179-
echo "SUCCESS. Upgrade did not failed when previous version was 1.10.0"
179+
echo "SUCCESS. Upgrade did not failed when previous version was 1.12.0"
180180
else
181-
echo "FAILED. Upgrade failed when previous version was 1.10.0"
181+
echo "FAILED. Upgrade failed when previous version was 1.12.0"
182182
return 1
183183
fi
184184
}
@@ -222,13 +222,13 @@ check_operator_upgrade_with_cluster_using_0_9_5() {
222222
remove_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
223223
}
224224

225-
check_operator_upgrade_with_cluster_using_1_10_0_and_1_11_0() {
225+
check_operator_upgrade_with_cluster_using_1_11_0_and_1_12_0() {
226226
CLUSTER_1_NAME="$(get_sgcluster_name "$SPEC_NAME-1")"
227227
CLUSTER_2_NAME="$(get_sgcluster_name "$SPEC_NAME-2")"
228228
NODE_LABEL_KEY="$(random_string)"
229229
NODE_LABEL_VALUE="$(random_string)"
230-
local PREVIOUS_VERSION_1=1.10.0
231-
local PREVIOUS_VERSION_2=1.11.0
230+
local PREVIOUS_VERSION_1=1.11.0
231+
local PREVIOUS_VERSION_2=1.12.0
232232
create_or_replace_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE" 1 \
233233
--set cluster.create=false \
234234
--set-string cluster.postgres.version=13.9

stackgres-k8s/e2e/spec/previous/1.10/spec/abstract/backup renamed to stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/backup

File renamed without changes.

stackgres-k8s/e2e/spec/previous/1.10/spec/abstract/dbops-major-version-upgrade renamed to stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/dbops-major-version-upgrade

File renamed without changes.

stackgres-k8s/e2e/spec/previous/1.10/spec/abstract/dbops-minor-version-upgrade renamed to stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/dbops-minor-version-upgrade

File renamed without changes.

stackgres-k8s/e2e/spec/previous/1.10/spec/abstract/dbops-restart renamed to stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/dbops-restart

File renamed without changes.

stackgres-k8s/e2e/spec/previous/1.10/spec/abstract/metrics renamed to stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/metrics

File renamed without changes.

stackgres-k8s/e2e/spec/previous/1.10/spec/abstract/patroni renamed to stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/patroni

File renamed without changes.

stackgres-k8s/e2e/spec/previous/1.10/spec/abstract/prometheus-integration renamed to stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/prometheus-integration

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ check_grafana_secret() {
4040

4141
check_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

stackgres-k8s/e2e/spec/previous/1.10/spec/abstract/quantity.jq renamed to stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/quantity.jq

File renamed without changes.

stackgres-k8s/e2e/spec/previous/1.10/spec/abstract/sharded-dbops renamed to stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/sharded-dbops

File renamed without changes.

0 commit comments

Comments
 (0)