From 12a99c7f7f4286315626c19e2548fe7e949c3b22 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Fri, 28 Aug 2020 18:14:03 +0200 Subject: [PATCH 1/2] Install kustomize without snap --- images/linux/scripts/installers/kubernetes-tools.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index bdd22dd2c..4710d968d 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -24,7 +24,9 @@ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux- sudo install minikube-linux-amd64 /usr/local/bin/minikube # Install kustomize -sudo snap install kustomize +curl -s "https://raw.githubusercontent.com/\ +kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash +mv kustomize /usr/local/bin # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" From 197cc250ed3f236db3367629a6e7d8f9c8c74ff2 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 31 Aug 2020 14:39:57 +0200 Subject: [PATCH 2/2] Code review: using a variable --- images/linux/scripts/installers/kubernetes-tools.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/linux/scripts/installers/kubernetes-tools.sh b/images/linux/scripts/installers/kubernetes-tools.sh index 4710d968d..f86f8abaa 100644 --- a/images/linux/scripts/installers/kubernetes-tools.sh +++ b/images/linux/scripts/installers/kubernetes-tools.sh @@ -24,8 +24,8 @@ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux- sudo install minikube-linux-amd64 /usr/local/bin/minikube # Install kustomize -curl -s "https://raw.githubusercontent.com/\ -kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash +download_url="https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" +curl -s "$download_url" | bash mv kustomize /usr/local/bin # Run tests to determine that the software installed as expected @@ -60,4 +60,4 @@ DocumentInstalledItem "helm ($(helm version --short |& head -n 1))" # minikube version output already has word minikube in it. example minikube version: v1.9.2 DocumentInstalledItem "$(minikube version --short)" # kustomize version output has "{} in it". example {kustomize/v3.8.1 2020-07-16T00:58:46Z } -DocumentInstalledItem "kustomize ($(kustomize version --short))" \ No newline at end of file +DocumentInstalledItem "kustomize ($(kustomize version --short))"