File tree Expand file tree Collapse file tree 2 files changed +3
-6
lines changed Expand file tree Collapse file tree 2 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -80,17 +80,17 @@ installTls() {
80
80
runCmd " $TEST " " Creating TLS secret $CC_TLS_K in cluster" \
81
81
" kubectl -n $CC_NS create secret tls $CC_TLS_K --key '$f2 ' --cert '$f1 '" || return 1
82
82
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 \
84
84
' {"spec": {"tls": [{"hosts": ["' $CC_CONTROL ' "],"secretName": "' $CC_TLS_A ' "}]}}'
85
85
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 \
87
87
' {"spec": {"tls": [{"hosts": ["' $CC_AUTH ' "],"secretName": "' $CC_TLS_K ' "}]}}'
88
88
89
89
cat $f2 $f2 > /tmp/$CC_DOMAIN .pem
90
90
rm -f $f1 $f2
91
91
pod=` kubectl -n $CC_NS get pods | grep control-center-ingress-nginx-controller | awk ' {print $1}' ` || return 1
92
92
[ -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
94
94
# runCmd "$TEST" "Restaring ingress" \
95
95
# "kubectl -n $CC_NS rollout restart deployment control-center-ingress-nginx-controller" || return 1
96
96
}
Original file line number Diff line number Diff line change @@ -24,7 +24,6 @@ setSuid() {
24
24
R=` realpath $W ` || return 1
25
25
O=` ls -l " $R " | awk ' {print $3}' `
26
26
P=` ls -l " $R " | awk ' {print $1}' `
27
- echo " $O $P "
28
27
[ " $O " = " root" ] || runCmd " $TEST " " Changing owner to root to: $R " " sudo chown root $R " || return 1
29
28
expr " $P " : " ^-..s" > /dev/null || runCmd " $TEST " " Setting sUI to $R " " sudo chmod u+s $R " || return 1
30
29
}
@@ -35,7 +34,6 @@ setSuid() {
35
34
# $3: port in guest
36
35
# $4: target port in host
37
36
startPortForward () {
38
- echo 1 " $1 "
39
37
H=` getPids " kubectl port-forward $2 " `
40
38
[ -n " $H " ] && log " Already running k8s port-forward $1 $2 $3 -> $4 with pid $H " && return 0
41
39
[ -z " $TEST " ] && log " Starting k8s port-forward $1 $2 $3 -> $4 "
@@ -53,7 +51,6 @@ stopPortForward() {
53
51
54
52
forwardIngress () {
55
53
startPortForward ${1:- $CC_NS } service/control-center-ingress-nginx-controller 443 443 || return 1
56
- sleep 3
57
54
}
58
55
59
56
stopForwardIngress () {
You can’t perform that action at this time.
0 commit comments