Skip to content

Commit f6c9a35

Browse files
committed
fixes for running PiT with --test flag
1 parent 12539e5 commit f6c9a35

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

scripts/pit/lib/lib-ccenter.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,17 @@ installTls() {
8080
runCmd "$TEST" "Creating TLS secret $CC_TLS_K in cluster" \
8181
"kubectl -n $CC_NS create secret tls $CC_TLS_K --key '$f2' --cert '$f1'" || return 1
8282

83-
kubectl patch ingress control-center -n $CC_NS --type=merge --patch \
83+
runCmd "$TEST" "patching $CC_TLS_A" kubectl patch ingress control-center -n $CC_NS --type=merge --patch \
8484
'{"spec": {"tls": [{"hosts": ["'$CC_CONTROL'"],"secretName": "'$CC_TLS_A'"}]}}'
8585

86-
kubectl patch ingress control-center -n $CC_NS --type=merge --patch \
86+
runCmd "$TEST" "patching $CC_TLS_AK" kubectl patch ingress control-center -n $CC_NS --type=merge --patch \
8787
'{"spec": {"tls": [{"hosts": ["'$CC_AUTH'"],"secretName": "'$CC_TLS_K'"}]}}'
8888

8989
cat $f2 $f2 > /tmp/$CC_DOMAIN.pem
9090
rm -f $f1 $f2
9191
pod=`kubectl -n $CC_NS get pods | grep control-center-ingress-nginx-controller | awk '{print $1}'` || return 1
9292
[ -n "$pod" ] && runCmd "$TEST" "Reloading nginx in $pod" "kubectl exec $pod -n "$CC_NS" -- nginx -s reload" || return 1
93-
sleep 10
93+
runCmd "$TEST" "Waiting for reloaging" sleep 10
9494
# runCmd "$TEST" "Restaring ingress" \
9595
# "kubectl -n $CC_NS rollout restart deployment control-center-ingress-nginx-controller" || return 1
9696
}

scripts/pit/lib/lib-k8s-kind.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ setSuid() {
2424
R=`realpath $W` || return 1
2525
O=`ls -l "$R" | awk '{print $3}'`
2626
P=`ls -l "$R" | awk '{print $1}'`
27-
echo "$O $P"
2827
[ "$O" = "root" ] || runCmd "$TEST" "Changing owner to root to: $R" "sudo chown root $R" || return 1
2928
expr "$P" : "^-..s" >/dev/null || runCmd "$TEST" "Setting sUI to $R" "sudo chmod u+s $R" || return 1
3029
}
@@ -35,7 +34,6 @@ setSuid() {
3534
# $3: port in guest
3635
# $4: target port in host
3736
startPortForward() {
38-
echo 1 "$1"
3937
H=`getPids "kubectl port-forward $2"`
4038
[ -n "$H" ] && log "Already running k8s port-forward $1 $2 $3 -> $4 with pid $H" && return 0
4139
[ -z "$TEST" ] && log "Starting k8s port-forward $1 $2 $3 -> $4"
@@ -53,7 +51,6 @@ stopPortForward() {
5351

5452
forwardIngress() {
5553
startPortForward ${1:-$CC_NS} service/control-center-ingress-nginx-controller 443 443 || return 1
56-
sleep 3
5754
}
5855

5956
stopForwardIngress() {

0 commit comments

Comments
 (0)