Skip to content

Commit 84fb7d2

Browse files
committed
fix: naming convention of Kind cluster
This PR makes the demo script use the same naming convention used by the setup and teardown common scripts. Signed-off-by: Leonardo Cecchi <leonardo.cecchi@enterprisedb.com>
1 parent f13067c commit 84fb7d2

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

demo/setup.sh

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
set -eux
2727

28+
K8S_BASE_NAME=${K8S_NAME:-k8s}
2829
git_repo_root=$(git rev-parse --show-toplevel)
2930
kube_config_path=${git_repo_root}/k8s/kube-config.yaml
3031
demo_yaml_path=${git_repo_root}/demo/yaml
@@ -60,51 +61,51 @@ for region in eu us; do
6061
# Deploy CloudNativePG operator (trunk - main branch)
6162
curl -sSfL \
6263
https://raw.githubusercontent.com/cloudnative-pg/artifacts/main/manifests/operator-manifest.yaml | \
63-
kubectl --context kind-k8s-${region} apply -f - --server-side
64+
kubectl --context kind-${K8S_BASE_NAME}-${region} apply -f - --server-side
6465
else
6566
# Deploy CloudNativePG operator (latest version, through the plugin)
6667
kubectl cnpg install generate --control-plane | \
67-
kubectl --context kind-k8s-${region} apply -f - --server-side
68+
kubectl --context kind-${K8S_BASE_NAME}-${region} apply -f - --server-side
6869
fi
6970

7071
# Wait for CNPG deployment to complete
71-
kubectl --context kind-k8s-${region} rollout status deployment \
72+
kubectl --context kind-${K8S_BASE_NAME}-${region} rollout status deployment \
7273
-n cnpg-system cnpg-controller-manager
7374

7475
# Deploy cert-manager
75-
kubectl apply --context kind-k8s-${region} -f \
76+
kubectl apply --context kind-${K8S_BASE_NAME}-${region} -f \
7677
https://github.com/cert-manager/cert-manager/releases/latest/download/cert-manager.yaml
7778

7879
# Wait for cert-manager deployment to complete
79-
kubectl rollout --context kind-k8s-${region} status deployment \
80+
kubectl rollout --context kind-${K8S_BASE_NAME}-${region} status deployment \
8081
-n cert-manager
81-
cmctl check api --wait=2m --context kind-k8s-${region}
82+
cmctl check api --wait=2m --context kind-${K8S_BASE_NAME}-${region}
8283

8384
if [ $trunk -eq 1 ]
8485
then
8586
# Deploy Barman Cloud Plugin (trunk)
86-
kubectl apply --context kind-k8s-${region} -f \
87+
kubectl apply --context kind-${K8S_BASE_NAME}-${region} -f \
8788
https://raw.githubusercontent.com/cloudnative-pg/plugin-barman-cloud/refs/heads/main/manifest.yaml
8889
else
8990
# Deploy Barman Cloud Plugin (latest stable)
90-
kubectl apply --context kind-k8s-${region} -f \
91+
kubectl apply --context kind-${K8S_BASE_NAME}-${region} -f \
9192
https://github.com/cloudnative-pg/plugin-barman-cloud/releases/latest/download/manifest.yaml
9293
fi
9394

9495
# Wait for Barman Cloud Plugin deployment to complete
95-
kubectl rollout --context kind-k8s-${region} status deployment \
96+
kubectl rollout --context kind-${K8S_BASE_NAME}-${region} status deployment \
9697
-n cnpg-system barman-cloud
9798

9899
# Create Barman object stores
99-
kubectl apply --context kind-k8s-${region} -f \
100+
kubectl apply --context kind-${K8S_BASE_NAME}-${region} -f \
100101
${demo_yaml_path}/object-stores
101102

102103
# Create the Postgres cluster
103-
kubectl apply --context kind-k8s-${region} -f \
104+
kubectl apply --context kind-${K8S_BASE_NAME}-${region} -f \
104105
${demo_yaml_path}/${region}/pg-${region}${legacy}.yaml
105106

106107
# Wait for the cluster to be ready
107-
kubectl wait --context kind-k8s-${region} \
108+
kubectl wait --context kind-${K8S_BASE_NAME}-${region} \
108109
--timeout 30m \
109110
--for=condition=Ready cluster/pg-${region}
110111

demo/teardown.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
set -ux
2525

26+
K8S_BASE_NAME=${K8S_NAME:-k8s}
2627
git_repo_root=$(git rev-parse --show-toplevel)
2728
kube_config_path=${git_repo_root}/k8s/kube-config.yaml
2829
demo_yaml_path=${git_repo_root}/demo/yaml
@@ -33,26 +34,25 @@ export KUBECONFIG=${kube_config_path}
3334

3435
# Delete deployment, one region at a time
3536
for region in eu us; do
36-
3737
# Delete the Postgres cluster
38-
kubectl delete --context kind-k8s-${region} -f \
38+
kubectl delete --context kind-${K8S_BASE_NAME}-${region} -f \
3939
${demo_yaml_path}/${region}
4040

4141
# Delete Barman object stores
42-
kubectl delete --context kind-k8s-${region} -f \
42+
kubectl delete --context kind-${K8S_BASE_NAME}-${region} -f \
4343
${demo_yaml_path}/object-stores
4444

4545
# Delete Barman Cloud Plugin
46-
kubectl delete --context kind-k8s-${region} -f \
46+
kubectl delete --context kind-${K8S_BASE_NAME}-${region} -f \
4747
https://github.com/cloudnative-pg/plugin-barman-cloud/releases/latest/download/manifest.yaml
4848

4949
# Delete cert-manager
50-
kubectl delete --context kind-k8s-${region} -f \
50+
kubectl delete --context kind-${K8S_BASE_NAME}-${region} -f \
5151
https://github.com/cert-manager/cert-manager/releases/latest/download/cert-manager.yaml
5252

5353
# Delete CNPG operator
5454
kubectl cnpg install generate --control-plane | \
55-
kubectl --context kind-k8s-${region} delete -f -
55+
kubectl --context kind-${K8S_BASE_NAME}-${region} delete -f -
5656

5757
# Remove backup data
5858
docker exec minio-${region} rm -rf /data/backups/pg-${region}

0 commit comments

Comments
 (0)