Skip to content

Commit 7d75468

Browse files
teoincontattoteoincontatto
committed
Merge branch 'remove-init-containers' into 'main'
Remove init containers See merge request ongresinc/stackgres!1654
2 parents 1448231 + 163ea0f commit 7d75468

132 files changed

Lines changed: 1878 additions & 1220 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/abstract/dbops-major-version-upgrade‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ reset_cluster_internal() {
103103
fi
104104

105105
wait_pods_running "$CLUSTER_NAMESPACE" "$PODS_RUNNING"
106-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
106+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
107+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
107108

108109
if [ "$ONLY_PG_REPACK" != true ] && [ -n "$SOURCE_POSTGIS_VERSION" ] && [ "$SOURCE_POSTGIS_VERSION" = "$TARGET_POSTGIS_VERSION" ]
109110
then

‎stackgres-k8s/e2e/spec/abstract/dbops-minor-version-upgrade‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ reset_cluster() {
2323
--set-string cluster.postgres.version="$E2E_MINOR_SOURCE_POSTGRES_VERSION"
2424

2525
wait_pods_running "$CLUSTER_NAMESPACE" 3
26-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
26+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
27+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
2728

2829
set_restarted_pods
2930

‎stackgres-k8s/e2e/spec/abstract/dbops-restart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ reset_cluster() {
2323
--set instanceProfiles[0].memory=512Mi \
2424

2525
wait_pods_running "$CLUSTER_NAMESPACE" "$((PODS_COUNT + 1))"
26-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
26+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
27+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
2728

2829
set_restarted_pods
2930

‎stackgres-k8s/e2e/spec/abstract/patroni‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ patroni_readiness_check() {
5151
}
5252

5353
get_pod_ip(){
54-
kubectl get pods -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -o wide | tail -n 1 | awk '{ print $6 }'
54+
kubectl get pods -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -o json | jq -r .status.podIP
5555
}
5656

5757
patroni_curl(){

‎stackgres-k8s/e2e/spec/connectivity‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ e2e_test_install() {
1515

1616
wait_pods_running "$CLUSTER_NAMESPACE" 3
1717
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
18+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
1819
}
1920

2021
e2e_test() {
@@ -70,6 +71,7 @@ EOF
7071
kubectl delete pod -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" "$CLUSTER_NAME-1"
7172
wait_pods_running "$CLUSTER_NAMESPACE" 3
7273
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
74+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
7375

7476
if wait_until check_password_is_required
7577
then
@@ -169,6 +171,7 @@ pgbouncer_users_check() {
169171
kubectl delete pod -n "$CLUSTER_NAMESPACE" -l "app=StackGresCluster,stackgres.io/cluster-name=$CLUSTER_NAME,stackgres.io/cluster=true"
170172
wait_pods_running "$CLUSTER_NAMESPACE" 3
171173
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
174+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
172175

173176
RESPONSE_REPLICA="$(wait_until run_query -h "$CLUSTER_NAME" -i 1 -p 5432 -u user1:test || true)"
174177
if [ "$RESPONSE_REPLICA" = "1" ]

‎stackgres-k8s/e2e/spec/dbops-sampling‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ e2e_test_install() {
1414
create_or_replace_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE" 2
1515

1616
wait_pods_running "$CLUSTER_NAMESPACE" 2
17-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
17+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
18+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
1819
}
1920

2021
e2e_test() {

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,17 @@ EOF
237237
wait_pods_running "$CLUSTER_NAMESPACE" 4
238238
fi
239239

240-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_1_NAME" "$CLUSTER_NAMESPACE"
240+
wait_cluster "$CLUSTER_1_NAME" "$CLUSTER_NAMESPACE"
241+
switch_cluster_to_first "$CLUSTER_1_NAME" "$CLUSTER_NAMESPACE"
241242
if [ "$E2E_SPEC_SECURITY_UPGRADE_LOW_PROFILE" != true ]
242243
then
243-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_2_NAME" "$CLUSTER_NAMESPACE"
244-
SWITCHOVER_TO_FIRST=true wait_sharded_cluster "$CLUSTER_3_NAME" "$CLUSTER_NAMESPACE"
244+
wait_cluster "$CLUSTER_2_NAME" "$CLUSTER_NAMESPACE"
245+
switch_cluster_to_first "$CLUSTER_2_NAME" "$CLUSTER_NAMESPACE"
246+
wait_sharded_cluster "$CLUSTER_3_NAME" "$CLUSTER_NAMESPACE"
247+
switch_sharded_cluster_to_first "$CLUSTER_3_NAME" "$CLUSTER_NAMESPACE"
245248
fi
246-
SWITCHOVER_TO_FIRST=true wait_cluster "$DISTRIBUTEDLOGS_NAME" "$CLUSTER_NAMESPACE"
249+
wait_cluster "$DISTRIBUTEDLOGS_NAME" "$CLUSTER_NAMESPACE"
250+
switch_cluster_to_first "$DISTRIBUTEDLOGS_NAME" "$CLUSTER_NAMESPACE"
247251

248252
generate_mock_data "$DISTRIBUTEDLOGS_NAME"
249253
generate_mock_data "$CLUSTER_1_NAME"
@@ -1117,7 +1121,7 @@ check_profile_mutation() {
11171121
fail "Containers section was NOT added to instance profiles after operator upgrade"
11181122
fi
11191123
if [ "$(kubectl get sginstanceprofile -n "$CLUSTER_NAMESPACE" "size-s" --template '{{ .spec.initContainers | len }}')" \
1120-
= "9" ]
1124+
= "10" ]
11211125
then
11221126
success "Init containers section was added to instance profiles after operator upgrade"
11231127
else

‎stackgres-k8s/e2e/spec/extensions‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ e2e_test_install() {
1616
--set-string configurations.postgresconfig.postgresql\\.conf.shared_preload_libraries=timescaledb
1717

1818
wait_pods_running "$CLUSTER_NAMESPACE" "2"
19-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
19+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
20+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
2021
}
2122

2223
e2e_test() {
@@ -110,7 +111,8 @@ check_extension_not_uninstalled_when_removed() {
110111

111112
kubectl delete pod -n "$CLUSTER_NAMESPACE" --all
112113
wait_pods_running "$CLUSTER_NAMESPACE" "2"
113-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
114+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
115+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
114116

115117
try_function run_query -i 0 -q 'CREATE EXTENSION timescaledb;' > /dev/null 2>&1
116118
if "$RESULT"
@@ -129,7 +131,8 @@ check_extension_without_shared_library_installed_when_added() {
129131

130132
kubectl delete pod -n "$CLUSTER_NAMESPACE" --all
131133
wait_pods_running "$CLUSTER_NAMESPACE" "2"
132-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
134+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
135+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
133136

134137
create_or_replace_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE" "2" \
135138
--reset-values \
@@ -221,7 +224,8 @@ check_extension_with_shared_library_installed_when_added() {
221224

222225
kubectl delete pod -n "$CLUSTER_NAMESPACE" --all
223226
wait_pods_running "$CLUSTER_NAMESPACE" "2"
224-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
227+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
228+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
225229

226230
create_or_replace_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE" "2" \
227231
--reset-values \
@@ -307,7 +311,8 @@ check_extension_with_shared_library_installed_when_upgraded() {
307311

308312
kubectl delete pod -n "$CLUSTER_NAMESPACE" --all
309313
wait_pods_running "$CLUSTER_NAMESPACE" "2"
310-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
314+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
315+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
311316

312317
try_function run_query -i 0 -q "ALTER EXTENSION pageinspect UPDATE TO '$PAGEINSPECT_NEW_VERSION';"
313318
if "$RESULT"
@@ -333,7 +338,8 @@ check_extension_with_executable_installed_when_added() {
333338

334339
kubectl delete pod -n "$CLUSTER_NAMESPACE" --all
335340
wait_pods_running "$CLUSTER_NAMESPACE" "2"
336-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
341+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
342+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
337343

338344
create_or_replace_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE" "2" \
339345
--reset-values \

‎stackgres-k8s/e2e/spec/pod-nodeselectors‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ e2e_test_install() {
1111
--set-string cluster.distributedLogs.sgDistributedLogs=distributedlogs \
1212
--set distributedLogs.enabled=true \
1313
--set-string "distributedLogs.scheduling.nodeSelector.$NODE_LABEL_KEY=$NODE_LABEL_VALUE"
14-
1514
}
1615

1716
e2e_test_uninstall() {

‎stackgres-k8s/e2e/spec/previous/1.14/spec/abstract/dbops-major-version-upgrade‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ reset_cluster_internal() {
109109
fi
110110

111111
wait_pods_running "$CLUSTER_NAMESPACE" "$PODS_RUNNING"
112-
SWITCHOVER_TO_FIRST=true wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
112+
wait_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
113+
switch_cluster_to_first "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
113114

114115
if [ "$ONLY_PG_REPACK" != true ] && [ -n "$SOURCE_POSTGIS_VERSION" ] && [ "$SOURCE_POSTGIS_VERSION" = "$TARGET_POSTGIS_VERSION" ]
115116
then

0 commit comments

Comments
 (0)