Skip to content

Commit 716b77e

Browse files
Aligned the Kubernetes setup code for s390x with the amd64 implementation (#11724)
Signed-off-by: Mujahid-Dandoti <Mujahid.Dandoti@ibm.com> Signed-off-by: Mujahid Dandoti <70288064+dandotimujahid@users.noreply.github.com> Co-authored-by: Lukáš Král <53821852+im-konge@users.noreply.github.com>
1 parent 52bb4f5 commit 716b77e

1 file changed

Lines changed: 2 additions & 9 deletions

File tree

.azure/scripts/setup-kubernetes.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,9 @@ if [ "$TEST_CLUSTER" = "minikube" ]; then
8989
set -ex
9090
fi
9191

92-
if [ "$ARCH" = "s390x" ]; then
92+
if [[ "$ARCH" = "ppc64le" ]]; then
9393
git clone -b v1.9.11 --depth 1 https://github.com/kubernetes/kubernetes.git
94-
sed -i 's/:1.11/:1.22.1/' kubernetes/cluster/addons/registry/images/Dockerfile
95-
docker build --pull -t gcr.io/google_containers/kube-registry-proxy:0.4-${ARCH} kubernetes/cluster/addons/registry/images/
96-
minikube image load ${ARCH}/registry:2.8.2 gcr.io/google_containers/kube-registry-proxy:0.4-${ARCH}
97-
minikube addons enable registry --images="Registry=${ARCH}/registry:2.8.2,KubeRegistryProxy=gcr.io/google_containers/kube-registry-proxy:0.4-${ARCH}"
98-
rm -rf kubernetes
99-
elif [[ "$ARCH" = "ppc64le" ]]; then
100-
git clone -b v1.9.11 --depth 1 https://github.com/kubernetes/kubernetes.git
101-
sed -i 's/:1.11/:1.22.1/' kubernetes/cluster/addons/registry/images/Dockerfile
94+
sed -i 's/:1.11/:1.22.1/' kubernetes/cluster/addons/registry/images/Dockerfile
10295
docker build --pull -t gcr.io/google_containers/kube-registry-proxy:0.4-${ARCH} kubernetes/cluster/addons/registry/images/
10396
minikube image load ${ARCH}/registry:2.8.2 gcr.io/google_containers/kube-registry-proxy:0.4-${ARCH}
10497
minikube addons enable registry --images="Registry=${ARCH}/registry:2.8.0-beta.1,KubeRegistryProxy=google_containers/kube-registry-proxy:0.4-${ARCH}"

0 commit comments

Comments
 (0)