Skip to content

Commit 51283bf

Browse files
committed
Merge branch 'add-version-1.16' into 'main'
Add version 1.16 See merge request ongresinc/stackgres!1631
2 parents fca0c40 + fcb8750 commit 51283bf

192 files changed

Lines changed: 866 additions & 646 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.

.gitlab/issue_templates/Beta Release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION
5050
```
5151
# Remember to create a key pair called gitlab-runner in the target AWS region
5252
AMI="$(aws ssm get-parameters --names /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-arm64-gp2 --query "Parameters[].Value" --output text)"
53-
curl -s https://gitlab.com/snippets/1985684/raw | bash -s -- -r "" -t m6gd.4xlarge -i "" -d 14400 -df internal -dp /dev/nvme1n1 -rn army-builder -tl 'docker-junit-extension-runner, oci-image, ongresinc, stackgres-maven-runner, stackgres-native-build-runner, stackgres-quarkus-test-runner, stackgres-runner-v2, linux-arm64, stackgres-e2e-runner'
53+
curl -s https://gitlab.com/snippets/1985684/raw | bash -s -- -r "glpat-CrykSN35Lymqo1UCJDUx" -t m6gd.4xlarge -i "" -d 14400 -df internal -dp /dev/nvme1n1 -rn army-builder -tl 'docker-junit-extension-runner, oci-image, ongresinc, stackgres-maven-runner, stackgres-native-build-runner, stackgres-quarkus-test-runner, stackgres-runner-v2, linux-arm64, stackgres-e2e-runner'
5454
```
5555
5656
Now we can push `release-1.15.0-beta1` branch and wait for the pipeline to complete:

.gitlab/issue_templates/GA Release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION
5050
```
5151
# Remember to create a key pair called gitlab-runner in the target AWS region
5252
AMI="$(aws ssm get-parameters --names /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-arm64-gp2 --query "Parameters[].Value" --output text)"
53-
curl -s https://gitlab.com/snippets/1985684/raw | bash -s -- -r "" -t m6gd.4xlarge -i "" -d 14400 -df internal -dp /dev/nvme1n1 -rn army-builder -tl 'docker-junit-extension-runner, oci-image, ongresinc, stackgres-maven-runner, stackgres-native-build-runner, stackgres-quarkus-test-runner, stackgres-runner-v2, linux-arm64, stackgres-e2e-runner'
53+
curl -s https://gitlab.com/snippets/1985684/raw | bash -s -- -r "glpat-CrykSN35Lymqo1UCJDUx" -t m6gd.4xlarge -i "" -d 14400 -df internal -dp /dev/nvme1n1 -rn army-builder -tl 'docker-junit-extension-runner, oci-image, ongresinc, stackgres-maven-runner, stackgres-native-build-runner, stackgres-quarkus-test-runner, stackgres-runner-v2, linux-arm64, stackgres-e2e-runner'
5454
```
5555
5656
Now we can push `release-1.15.0` branch and wait for the pipeline to complete:

.gitlab/issue_templates/RC Release.md

Lines changed: 57 additions & 101 deletions
Large diffs are not rendered by default.

CHANGELOG.md

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,63 @@
1+
# :rocket: Release 1.15.0-rc1 (2024-12-04)
2+
3+
## :notepad_spiral: NOTES
4+
5+
StackGres 1.15.0-rc1 is (finally) out! :confetti_ball: :champagne:
6+
7+
This release brings support for Patroni 4 that include some cool features like "Quorum-based failover" or "Register Citus secondaries in pg_dist_node" but also many bugfixes.
8+
9+
Another important change is the new SGDistributedLogs that after the upgrade will generate an SGCluster. This change allow to use SGDbOps in order to perform restart, security upgrade, minor version and major version upgrades operations.
10+
11+
Performance and responsiveness have been improved by allowing to reconcile StackGres custom resources in parallel with a queue that gives priority to reconciliation of StackGres custom resources that receive changes. This should improve the use cases with many StackGres custom resources.
12+
13+
So, what you are waiting for to try this release and have a look to the future of StackGres!
14+
15+
## :sparkles: NEW FEATURES AND CHANGES
16+
17+
* Support for Patroni 4.0.4
18+
* Support for Postgres 17.2, 16.6, 15.10, 14.15, 13.18 and 12.22
19+
* Envoy 1.32.1
20+
* Prometheus Postgres Exporter 0.16.0
21+
* Fluent-bit 3.2.1
22+
* OTEL Collector 0.114.0
23+
* Make SGDistributedLogs generate an SGCluster
24+
* Support for headless service
25+
* Improve performance and responsiveness
26+
* Allow to disable Envoy
27+
28+
## Web Console
29+
30+
Nothing new here! :eyes:
31+
32+
## :bug: FIXES
33+
34+
* Make int-or-string fields real int-or-string and not just string fields
35+
* Allow to rollback upgrade when CHECKPOINT fail
36+
* SGScript and SGCluster script entry version are resetted to 0 if part of a reconciliation of another CR
37+
38+
## Web Console
39+
40+
Nothing new here! :eyes:
41+
42+
## :construction: KNOWN ISSUES
43+
44+
* Backups may be restored with inconsistencies when performed with a Postgres instance running on a different architecture ([#1539](https://gitlab.com/ongresinc/stackgres/-/issues/1539))
45+
46+
## :up: UPGRADE
47+
48+
To upgrade from a previous installation of the StackGres operator's helm chart you will have to upgrade the helm chart release.
49+
For more detailed information please refer to [our documentation](https://stackgres.io/doc/latest/install/helm/upgrade/#upgrade-operator).
50+
51+
To upgrade StackGres operator's (upgrade only works starting from 1.1 version or above) helm chart issue the following commands (replace namespace and release name if you used something different):
52+
53+
`helm upgrade -n "stackgres" "stackgres-operator" https://stackgres.io/downloads/stackgres-k8s/stackgres/1.15.0-rc1/helm/stackgres-operator.tgz`
54+
55+
> IMPORTANT: This release is incompatible with previous `alpha` or `beta` versions. Upgrading from those versions will require uninstalling completely StackGres including all clusters and StackGres CRDs (those in `stackgres.io` group) first.
56+
57+
Thank you for all the issues created, ideas, and code contributions by the StackGres Community!
58+
59+
## :twisted_rightwards_arrows: [FULL LIST OF COMMITS](https://gitlab.com/ongresinc/stackgres/-/commits/1.15.0-rc1)
60+
161
# :rocket: Release 1.14.1 (2024-11-25)
262

363
## :notepad_spiral: NOTES

doc/content/en/01-introduction/06-versions/_index.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,30 @@ showToc: true
88

99
=======
1010

11+
## StackGres 1.15.0-rc1
12+
13+
| Component | Versions |
14+
| ------ | ----------- |
15+
| PostgreSQL 17 | 17.2, 17.0 |
16+
| PostgreSQL 16 | 16.6, 16.4, 16.3, 16.2, 16.1, 16.0 |
17+
| PostgreSQL 15 | 15.10, 15.8, 15.7, 15.6, 15.5, 15.4, 15.3, 15.2, 15.1, 15.0 |
18+
| PostgreSQL 14 | 14.15, 14.13, 14.12, 14.11, 14.10, 14.9, 14.8, 14.7, 14.6, 14.5, 14.4, ~14.2, 14.1, 14.0~ |
19+
| PostgreSQL 13 | 13.18, 13.16 13.15, 13.14, 13.13, 13.12, 13.11, 13.10, 13.9, 13.8, 13.7, 13.6, 13.5, 13.4, 13.3, 13.2, 13.1, 13.0 |
20+
| PostgreSQL 12 | 12.22, 12.20, 12.19, 12.18, 12.17, 12.16, 12.15, 12.14, 12.13, 12.12, 12.11, 12.10, 12.9, 12.8, 12.7, 12.6, 12.5, 12.4, 12.3, 12.2 and 12.1 |
21+
| PostgreSQL for Babelfish 16 | 16.4, 16.2, 16.1 |
22+
| PostgreSQL for Babelfish 15 | 15.8, 15.5 |
23+
| PostgreSQL for Babelfish 14 | 14.11, 14.10, 14.3 |
24+
| PostgreSQL for Babelfish 13 | 13.9, 13.6 |
25+
| Patroni | 4.0.4, 3.3.3, 3.3.2, 3.3.0, 3.2.2, 3.0.2, 2.1.4 |
26+
| WAL-G | 3.0.3, 3.0.2, 3.0.1, 2.0.1, 2.0.0, 1.1 |
27+
| PgBouncer | 1.23.1 |
28+
| Postgres Exporter | 0.16.0 |
29+
| Envoy | 1.32.1 |
30+
| Fluent-Bit | 3.2.1 |
31+
| Fluentd | 1.17.1 |
32+
| Babelfish Compass | 2024.10b |
33+
| OTEL Collector | 0.114.0 |
34+
1135
## StackGres 1.14.1
1236

1337
| Component | Versions |

stackgres-k8s/ci/build/ciw

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22
PROJECT_PATH="$(realpath "$(dirname "$0")/../../..")"
33
CONTAINER_NAME="${CONTAINER_NAME:-buildw-$(printf '%x' "$(date +%s)")}"
4+
export PATH=/bin:/usr/bin:/usr/local/bin
45
env > "/tmp/$CONTAINER_NAME.env"
56
IMAGE="${IMAGE:-registry.gitlab.com/ongresinc/stackgres/$(yq -r '.variables.SG_CI_IMAGE_NAME' "$PROJECT_PATH"/.gitlab-ci.yml 2>/dev/null || sed -n 's/ *SG_CI_IMAGE_NAME: "\([^"]\+\)" */\1/p' .gitlab-ci.yml)-$(uname -m | grep -qxF aarch64 && echo arm64 || echo amd64)}"
67
# shellcheck disable=SC2046

stackgres-k8s/ci/utils/glabw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22

33
mkdir -p ~/.config/glab-cli
4-
docker run -u "$(id -u):$(id -g)" -v /etc/passwd:/etc/passwd:ro -v "$HOME":"$HOME":ro -e PROMPT_COMMAND= --rm -ti -v "$(pwd):$(pwd)" -w "$(pwd)" -v "$HOME/.config/glab-cli:$HOME/.config/glab-cli" registry.gitlab.com/gitlab-org/cli glab "$@"
4+
docker run -u "$(id -u):$(id -g)" -v /etc/passwd:/etc/passwd:ro -v "$HOME":"$HOME":ro -e PROMPT_COMMAND= --rm $([ -t 0 ] && printf %s -t) -i -v "$(pwd):$(pwd)" -w "$(pwd)" -v "$HOME/.config/glab-cli:$HOME/.config/glab-cli" registry.gitlab.com/gitlab-org/cli glab "$@"

stackgres-k8s/e2e/spec/dbops-security-upgrade

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,19 @@ e2e_test_install() {
5959
PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION="${PREVIOUS_OLDEST_PATRONI_IMAGE##*-pg}"
6060
PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_VERSION="${PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%-build-*}"
6161
PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_MAJOR_VERSION="${PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%.*}"
62+
PREVIOUS_SHARDED_PATRONI_IMAGE="$(printf '%s' "$PREVIOUS_PATRONI_IMAGE" | grep '/patroni\(-ext\)\?:v[0-9.]\+-pg16\.' | head -n 1)"
63+
PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION="${PREVIOUS_SHARDED_PATRONI_IMAGE##*-pg}"
64+
PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION="${PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%-build-*}"
65+
PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_MAJOR_VERSION="${PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%.*}"
6266
PREVIOUS_PATRONI_IMAGE="$(printf '%s' "$PREVIOUS_PATRONI_IMAGE" | tail -n 1)"
6367
PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION="${PREVIOUS_PATRONI_IMAGE##*-pg}"
6468
PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION="${PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%-build-*}"
6569
PREVIOUS_PATRONI_IMAGE_POSTGRES_MAJOR_VERSION="${PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%.*}"
6670
PATRONI_IMAGE="$(get_component_images "$STACKGRES_VERSION")"
6771
OLDEST_PATRONI_IMAGE="$(printf %s "$PATRONI_IMAGE" | grep '/patroni\(-ext\)\?:v[0-9.]\+-pg'"$PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_VERSION-")"
6872
OLDEST_PATRONI_IMAGE="$(printf '%s' "$OLDEST_PATRONI_IMAGE" | tail -n 1)"
73+
SHARDED_PATRONI_IMAGE="$(printf %s "$PATRONI_IMAGE" | grep '/patroni\(-ext\)\?:v[0-9.]\+-pg'"$PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION-")"
74+
SHARDED_PATRONI_IMAGE="$(printf '%s' "$SHARDED_PATRONI_IMAGE" | tail -n 1)"
6975
if [ "$PREVIOUS_VERSION_AS_NUMBER" -ge "$VERSION_AS_NUMBER_1_15_0" ]
7076
then
7177
DISTRIBUTEDLOGS_PATRONI_IMAGE="$(printf '%s' "$PATRONI_IMAGE" | tail -n 1)"
@@ -154,11 +160,13 @@ e2e_test_install() {
154160

155161
create_or_replace_sharded_cluster_for_version "$STACKGRES_PREVIOUS_VERSION" \
156162
"$CLUSTER_3_NAME" "$CLUSTER_NAMESPACE" 3 1 \
157-
--set configurations.create=false --set instanceProfiles=false \
163+
--set configurations.create=true --set instanceProfiles=false \
164+
--set configurations.postgresconfig.create=true \
165+
--set configurations.poolingconfig.create=false \
158166
--set-string cluster.sgInstanceProfile=size-s \
159-
--set-string cluster.configurations.sgPostgresConfig=postgresconf-"${PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION%.*}" \
160-
--set-string shardedCluster.shards.configurations.sgPostgresConfig=postgresconf-"${PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION%.*}" \
161-
--set-string cluster.postgres.version="$PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION" \
167+
--set-string cluster.configurations.sgPostgresConfig=postgresconf-"${PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION%.*}" \
168+
--set-string shardedCluster.shards.configurations.sgPostgresConfig=postgresconf-"${PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION%.*}" \
169+
--set-string cluster.postgres.version="$PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION" \
162170
--set cluster.configurations.observability.prometheusAutobind=true \
163171
--set configurations.objectstorage.create=false \
164172
--set-string cluster.configurations.backups.sgObjectStorage=backupconf \
@@ -584,6 +592,8 @@ check_cluster_2_security_upgrade_start() {
584592
}
585593

586594
check_cluster_3_security_upgrade_start() {
595+
local PREVIOUS_PATRONI_IMAGE="$PREVIOUS_SHARDED_PATRONI_IMAGE"
596+
587597
check_sharded_cluster_security_upgrade_start \
588598
"$CLUSTER_3_NAME" "$DBOPS_3_NAME" "InPlace" \
589599
"$PREVIOUS_PATRONI_3_CONFIG_PATH" "$PREVIOUS_PGBOUNCER_3_CONFIG_PATH"
@@ -609,6 +619,8 @@ check_cluster_2_security_upgrade() {
609619
}
610620

611621
check_cluster_3_security_upgrade() {
622+
local PATRONI_IMAGE="$SHARDED_PATRONI_IMAGE"
623+
612624
check_sharded_cluster_security_upgrade \
613625
"$CLUSTER_3_NAME" "$DBOPS_3_NAME" "InPlace"
614626
}

stackgres-k8s/e2e/spec/dbops-security-upgrade-olm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,16 @@ e2e_load_images() {
4242
cat << EOF > "$LOG_PATH/operator-bundle.Dockerfile"
4343
FROM "$BUNDLE_IMAGE_NAME" AS bundle
4444
45-
FROM alpine AS overwrites
45+
FROM debian AS overwrites
4646
COPY --from=bundle / /bundle
4747
RUN sed -i 's|^ name: .*$| name: stackgres.v$BUNDLE_STACKGRES_VERSION|' /bundle/manifests/stackgres.clusterserviceversion.yaml
4848
RUN sed -i 's|^ version: .*$| version: $BUNDLE_STACKGRES_VERSION|' /bundle/manifests/stackgres.clusterserviceversion.yaml
4949
RUN sed -i 's|^ containerImage: quay.io/stackgres/operator:.*$| containerImage: $OPERATOR_IMAGE_NAME|' /bundle/manifests/stackgres.clusterserviceversion.yaml
5050
RUN sed -i 's|^ image: quay.io/stackgres/operator:.*$| image: $OPERATOR_IMAGE_NAME|' /bundle/manifests/stackgres.clusterserviceversion.yaml
51+
RUN sed -i '/name: OPERATOR_VERSION$/{\$!{N;s/name: OPERATOR_VERSION\n\( *\)value: .*$/name: OPERATOR_VERSION\n\1value: "$STACKGRES_VERSION"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
52+
RUN sed -i '/name: OPERATOR_IMAGE_VERSION$/{\$!{N;s/name: OPERATOR_IMAGE_VERSION\n\( *\)value: .*$/name: OPERATOR_IMAGE_VERSION\n\1value: "$IMAGE_TAG"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
53+
RUN sed -i '/name: OPERATOR_JVM_IMAGE_VERSION$/{\$!{N;s/name: OPERATOR_JVM_IMAGE_VERSION\n\( *\)value: .*$/name: OPERATOR_JVM_IMAGE_VERSION\n\1value: "$NATIVE_IMAGE_TAG-jvm"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
54+
RUN sed -i '/name: OPERATOR_NATIVE_IMAGE_VERSION$/{\$!{N;s/name: OPERATOR_NATIVE_IMAGE_VERSION\n\( *\)value: .*$/name: OPERATOR_NATIVE_IMAGE_VERSION\n\1value: "$NATIVE_IMAGE_TAG"/;ty;P;D;:y}}' /bundle/manifests/stackgres.clusterserviceversion.yaml
5155
5256
FROM scratch
5357
COPY --from=overwrites /bundle /
@@ -57,7 +61,7 @@ $(
5761
| sed 's/^/ /'
5862
)
5963
EOF
60-
BUNDLE_IMAGE_NAME="${BUNDLE_IMAGE_NAME}-overridden"
64+
BUNDLE_IMAGE_NAME="${BUNDLE_IMAGE_NAME}-overridden-$(date +%s)-$RANDOM"
6165
docker build -t "$BUNDLE_IMAGE_NAME" -f "$LOG_PATH/operator-bundle.Dockerfile" "$LOG_PATH/operator-bundle"
6266
docker push "$BUNDLE_IMAGE_NAME"
6367
}

stackgres-k8s/e2e/spec/operator-helm

Lines changed: 11 additions & 11 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.13.0" check_operator_upgrade_1_13_0
2827
run_test "Check that operator can be upgrade from version 1.14.0" check_operator_upgrade_1_14_0
28+
run_test "Check that operator can be upgrade from version 1.15.0" check_operator_upgrade_1_15_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.13.0 and 1.14.0" check_operator_upgrade_with_cluster_using_1_13_0_and_1_14_0
30+
run_test "Check that operator can be upgrade with an SGCluster that uses version 1.14.0 and 1.15.0" check_operator_upgrade_with_cluster_using_1_14_0_and_1_15_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
@@ -163,17 +163,17 @@ check_operator_upgrade_0_9_5() {
163163
fi
164164
}
165165

166-
check_operator_upgrade_1_13_0() {
167-
local PREVIOUS_VERSION=1.13.0
166+
check_operator_upgrade_1_15_0() {
167+
local PREVIOUS_VERSION=1.15.0
168168
kubectl label deployment -n "$OPERATOR_NAMESPACE" stackgres-operator \
169169
--overwrite "version=$PREVIOUS_VERSION"
170170
local EXIT_CODE RESULT
171171
try_function upgrade_operator
172172
if "$RESULT"
173173
then
174-
success "Upgrade did not failed when previous version was 1.13.0"
174+
success "Upgrade did not failed when previous version was 1.15.0"
175175
else
176-
fail "Upgrade failed when previous version was 1.13.0"
176+
fail "Upgrade failed when previous version was 1.15.0"
177177
fi
178178
}
179179

@@ -214,13 +214,13 @@ check_operator_upgrade_with_cluster_using_0_9_5() {
214214
remove_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
215215
}
216216

217-
check_operator_upgrade_with_cluster_using_1_13_0_and_1_14_0() {
217+
check_operator_upgrade_with_cluster_using_1_14_0_and_1_15_0() {
218218
CLUSTER_1_NAME="$(get_sgcluster_name "$SPEC_NAME-1")"
219219
CLUSTER_2_NAME="$(get_sgcluster_name "$SPEC_NAME-2")"
220220
NODE_LABEL_KEY="$(random_string)"
221221
NODE_LABEL_VALUE="$(random_string)"
222-
local PREVIOUS_VERSION_1=1.13.0
223-
local PREVIOUS_VERSION_2=1.14.0
222+
local PREVIOUS_VERSION_1=1.14.0
223+
local PREVIOUS_VERSION_2=1.15.0
224224
create_or_replace_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE" 1 \
225225
--set cluster.create=false \
226226
--set-string cluster.postgres.version=13.9
@@ -246,9 +246,9 @@ check_operator_upgrade_with_cluster_using_1_13_0_and_1_14_0() {
246246
try_function upgrade_operator
247247
if "$RESULT"
248248
then
249-
success "Upgrade did not failed with an SGCluster that uses version 1.13.0 and 1.14.0"
249+
success "Upgrade did not failed with an SGCluster that uses version 1.14.0 and 1.15.0"
250250
else
251-
fail "Upgrade failed with an SGCluster that uses version 1.13.0 and 1.14.0"
251+
fail "Upgrade failed with an SGCluster that uses version 1.14.0 and 1.15.0"
252252
fi
253253
remove_cluster "$CLUSTER_1_NAME" "$CLUSTER_NAMESPACE"
254254
remove_cluster "$CLUSTER_2_NAME" "$CLUSTER_NAMESPACE"

0 commit comments

Comments
 (0)