From df3e23cbc725869f563bbfcc9bf0081f30f63247 Mon Sep 17 00:00:00 2001 From: Matteo Scandolo Date: Fri, 26 Mar 2021 09:17:16 -0700 Subject: [PATCH 1/2] Adding connection timeout to probe script --- onos-classic/templates/configmap-probe.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/onos-classic/templates/configmap-probe.yaml b/onos-classic/templates/configmap-probe.yaml index 84afe13a..f7211a71 100644 --- a/onos-classic/templates/configmap-probe.yaml +++ b/onos-classic/templates/configmap-probe.yaml @@ -15,7 +15,7 @@ data: # Wait for {{ .Values.probe_timeout }}s before timing out host=`hostname -s` id=onos-`hostname -s | awk -F '-' '{print $NF}'` - result=$(curl -m {{ .Values.probe_timeout }} -s -f http://$host:8181/onos/v1/cluster/$id --user onos:rocks) + result=$(curl --connect-timeout {{ .Values.probe_timeout }} -m {{ .Values.probe_timeout }} -s -f http://$host:8181/onos/v1/cluster/$id --user onos:rocks) echo $result if ! printf '%q' $result | grep -q -i "READY"; then @@ -29,7 +29,7 @@ data: {{- end }} for app in ${apps[@]}; do - result=$(curl -m {{ .Values.probe_timeout }} -s -f http://$host:8181/onos/v1/applications/$app/health --user onos:rocks) + result=$(curl --connect-timeout {{ .Values.probe_timeout }} -m {{ .Values.probe_timeout }} -s -f http://$host:8181/onos/v1/applications/$app/health --user onos:rocks) echo $result if ! printf %q $result | grep -q -i "READY"; then echo "$app is not yet ready" From 4fc636d71b8ec026d61b20eef4a7f49bafa18abd Mon Sep 17 00:00:00 2001 From: Matteo Scandolo Date: Fri, 26 Mar 2021 09:18:49 -0700 Subject: [PATCH 2/2] Bumping onos-classic version --- onos-classic/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onos-classic/Chart.yaml b/onos-classic/Chart.yaml index 8858ac36..c010b273 100644 --- a/onos-classic/Chart.yaml +++ b/onos-classic/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v1 name: onos-classic -version: 0.1.13 +version: 0.1.14 kubeVersion: ">=1.10.0" appVersion: 2.2.6 description: ONOS cluster