Skip to content

Commit dfaa656

Browse files
committed
e2e: fix bitnamy image repository change
1 parent fe44df0 commit dfaa656

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

stackgres-k8s/e2e/utils/etcd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ install_etcd() {
2727
--create-namespace \
2828
--namespace "$(etcd_namespace)" \
2929
--set-string auth.rbac.rootPassword=test \
30+
--set-string image.repository=bitnamilegacy/etcd \
3031
"$@"
3132

3233
wait_pods_running "$(etcd_namespace)" 1

stackgres-k8s/e2e/utils/shardingsphere-operator

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ install_shardingsphere_operator() {
2929
--namespace "$(shardingsphere_namespace)" \
3030
--set operator.featureGates.computeNode=true \
3131
--set proxyCluster.enabled=false \
32+
--set-string zookeeper.image.repository=bitnamilegacy/zookeeper \
3233
"$@"
3334
kubectl delete clusterrole shardingsphere-operator-for-stackgres --ignore-not-found
3435
kubectl delete clusterrolebinding shardingsphere-operator-for-stackgres --ignore-not-found
Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
#!/bin/sh
22

33
wait_certificate_approval() {
4-
while true
5-
do
6-
CRS_STATUS="$(kubectl get csr stackgres-operator -o jsonpath='{.status.conditions[0].type}')"
7-
if [ "$CRS_STATUS" = "Approved" ]; then
8-
break;
9-
fi
10-
sleep 1
11-
done
12-
echo "Certificate approved"
13-
}
4+
if kubectl wait --timeout="$E2E_TIMEOUT"s csr stackgres-operator --for=condition=Approved
5+
then
6+
echo "Certificate approved"
7+
else
8+
echo "Timeout while waiting for certificate approval"
9+
return 1
10+
fi
11+
}

0 commit comments

Comments
 (0)