From cb678dacbcfb50f5cc5ecfc9fdf194cafb563b8c Mon Sep 17 00:00:00 2001 From: Dmitrii Ustiugov Date: Wed, 23 Jun 2021 12:41:13 +0100 Subject: [PATCH 1/2] fixed Istio version to 1.7.8 made sure that Zipkin manifest is for Istio 1.7. Signed-off-by: Dmitrii Ustiugov --- scripts/cluster/setup_master_node.sh | 7 ++++--- scripts/setup_zipkin.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/cluster/setup_master_node.sh b/scripts/cluster/setup_master_node.sh index d7e0bc250..badaaba4e 100755 --- a/scripts/cluster/setup_master_node.sh +++ b/scripts/cluster/setup_master_node.sh @@ -43,9 +43,10 @@ kubectl apply -f $ROOT/configs/metallb/metallb-configmap.yaml # istio cd $ROOT -curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.7.1 TARGET_ARCH=x86_64 sh - -export PATH=$PATH:$ROOT/istio-1.7.1/bin -sudo sh -c "echo 'export PATH=\$PATH:$ROOT/istio-1.7.1/bin' >> /etc/profile" +ISTIO_VERSION=1.7.8 # Make sure that Zipkin manifest is for the same major version (e.g., 1.7) of Istio +curl -L https://istio.io/downloadIstio | ISTIO_VERSION=${ISTIO_VERSION} TARGET_ARCH=x86_64 sh - +export PATH=$PATH:$ROOT/istio-${ISTIO_VERION}/bin +sudo sh -c "echo 'export PATH=\$PATH:$ROOT/istio-${ISTIO_VERSION}/bin' >> /etc/profile" istioctl install -f $ROOT/configs/istio/istio-minimal-operator.yaml KNATIVE_VERSION=v0.23.0 diff --git a/scripts/setup_zipkin.sh b/scripts/setup_zipkin.sh index d677511e1..2658ae8ac 100755 --- a/scripts/setup_zipkin.sh +++ b/scripts/setup_zipkin.sh @@ -24,7 +24,7 @@ set -e # install zipkin pods -kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.9/samples/addons/extras/zipkin.yaml +kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.7/samples/addons/extras/zipkin.yaml sleep 10s From 7e9513409ed7278de6620f3b816d3fa7492a4552 Mon Sep 17 00:00:00 2001 From: Dmitrii Ustiugov Date: Wed, 23 Jun 2021 12:21:16 +0100 Subject: [PATCH 2/2] enabled Istio sidecar injection Signed-off-by: Dmitrii Ustiugov --- scripts/cluster/setup_master_node.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/cluster/setup_master_node.sh b/scripts/cluster/setup_master_node.sh index badaaba4e..2c2b0dc33 100755 --- a/scripts/cluster/setup_master_node.sh +++ b/scripts/cluster/setup_master_node.sh @@ -43,7 +43,7 @@ kubectl apply -f $ROOT/configs/metallb/metallb-configmap.yaml # istio cd $ROOT -ISTIO_VERSION=1.7.8 # Make sure that Zipkin manifest is for the same major version (e.g., 1.7) of Istio +ISTIO_VERSION=1.7.1 # Make sure that Zipkin manifest is for the same major version (e.g., 1.7) of Istio curl -L https://istio.io/downloadIstio | ISTIO_VERSION=${ISTIO_VERSION} TARGET_ARCH=x86_64 sh - export PATH=$PATH:$ROOT/istio-${ISTIO_VERION}/bin sudo sh -c "echo 'export PATH=\$PATH:$ROOT/istio-${ISTIO_VERSION}/bin' >> /etc/profile" @@ -82,3 +82,5 @@ kubectl apply --filename https://github.com/knative/eventing/releases/download/$ kubectl apply --filename https://github.com/knative/eventing/releases/download/$KNATIVE_VERSION/mt-channel-broker.yaml kubectl --namespace istio-system get service istio-ingressgateway +sleep 2m +kubectl label namespace default istio-injection=enabled