From f4fefc41beb4751cacd11c90c6490d88ee2e8fae Mon Sep 17 00:00:00 2001 From: TannerGilbert Date: Mon, 7 Feb 2022 17:10:17 +0100 Subject: [PATCH 1/2] fix: Removed jq dependency --- istio-configuration/configure-istio.sh | 2 +- quickstart/expose-keptn.sh | 2 +- quickstart/multistage-delivery.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/istio-configuration/configure-istio.sh b/istio-configuration/configure-istio.sh index a3185f1..66257ec 100755 --- a/istio-configuration/configure-istio.sh +++ b/istio-configuration/configure-istio.sh @@ -18,7 +18,7 @@ fi echo "External IP for istio-ingressgateway is ${INGRESS_IP}, creating configmaps..." K8S_VERSION=$(kubectl version -ojson) -K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | jq -r .serverVersion.minor) +K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | grep 'minor' | tail -1 | sed 's/^.*: //' | sed 's/^"\(.*\)".*/\1/') if [[ "$K8S_VERSION_MINOR" < "19" ]] then diff --git a/quickstart/expose-keptn.sh b/quickstart/expose-keptn.sh index 5f63ef4..4745679 100755 --- a/quickstart/expose-keptn.sh +++ b/quickstart/expose-keptn.sh @@ -73,7 +73,7 @@ SLEEP_TIME=5 print_headline "Configuring Ingress for your local installation" K8S_VERSION=$(kubectl version -ojson) -K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | jq -r .serverVersion.minor) +K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | grep 'minor' | tail -1 | sed 's/^.*: //' | sed 's/^"\(.*\)".*/\1/') if [[ "$K8S_VERSION_MINOR" < "19" ]] then diff --git a/quickstart/multistage-delivery.sh b/quickstart/multistage-delivery.sh index 087838b..fe4480c 100755 --- a/quickstart/multistage-delivery.sh +++ b/quickstart/multistage-delivery.sh @@ -137,7 +137,7 @@ helm install prometheus prometheus-community/prometheus --namespace monitoring - verify_test_step $? "Install prometheus failed" K8S_VERSION=$(kubectl version -ojson) -K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | jq -r .serverVersion.minor) +K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | grep 'minor' | tail -1 | sed 's/^.*: //' | sed 's/^"\(.*\)".*/\1/'")" if [[ "$K8S_VERSION_MINOR" < "19" ]] then From 90dd551bcdcc3aad5aa9e1dce7c374edbcb680f7 Mon Sep 17 00:00:00 2001 From: TannerGilbert Date: Mon, 7 Feb 2022 17:10:17 +0100 Subject: [PATCH 2/2] fix: Removed jq dependency Signed-off-by: TannerGilbert --- istio-configuration/configure-istio.sh | 2 +- quickstart/expose-keptn.sh | 2 +- quickstart/multistage-delivery.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/istio-configuration/configure-istio.sh b/istio-configuration/configure-istio.sh index a3185f1..66257ec 100755 --- a/istio-configuration/configure-istio.sh +++ b/istio-configuration/configure-istio.sh @@ -18,7 +18,7 @@ fi echo "External IP for istio-ingressgateway is ${INGRESS_IP}, creating configmaps..." K8S_VERSION=$(kubectl version -ojson) -K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | jq -r .serverVersion.minor) +K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | grep 'minor' | tail -1 | sed 's/^.*: //' | sed 's/^"\(.*\)".*/\1/') if [[ "$K8S_VERSION_MINOR" < "19" ]] then diff --git a/quickstart/expose-keptn.sh b/quickstart/expose-keptn.sh index 5f63ef4..4745679 100755 --- a/quickstart/expose-keptn.sh +++ b/quickstart/expose-keptn.sh @@ -73,7 +73,7 @@ SLEEP_TIME=5 print_headline "Configuring Ingress for your local installation" K8S_VERSION=$(kubectl version -ojson) -K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | jq -r .serverVersion.minor) +K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | grep 'minor' | tail -1 | sed 's/^.*: //' | sed 's/^"\(.*\)".*/\1/') if [[ "$K8S_VERSION_MINOR" < "19" ]] then diff --git a/quickstart/multistage-delivery.sh b/quickstart/multistage-delivery.sh index 087838b..2b347a4 100755 --- a/quickstart/multistage-delivery.sh +++ b/quickstart/multistage-delivery.sh @@ -137,7 +137,7 @@ helm install prometheus prometheus-community/prometheus --namespace monitoring - verify_test_step $? "Install prometheus failed" K8S_VERSION=$(kubectl version -ojson) -K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | jq -r .serverVersion.minor) +K8S_VERSION_MINOR=$(echo "$K8S_VERSION" | grep 'minor' | tail -1 | sed 's/^.*: //' | sed 's/^"\(.*\)".*/\1/') if [[ "$K8S_VERSION_MINOR" < "19" ]] then