diff --git a/minikube-aio/images.txt b/minikube-aio/images.txt index 822c551d..cd35ecb5 100644 --- a/minikube-aio/images.txt +++ b/minikube-aio/images.txt @@ -1,3 +1,3 @@ gcr.io/k8s-minikube/storage-provisioner:v1.8.1 -gcr.io/kubernetes-helm/tiller:${HELM_VERSION} +ghcr.io/helm/tiller:${HELM_VERSION} k8s.gcr.io/kube-addon-manager:v9.0 diff --git a/minikube-aio/install.sh b/minikube-aio/install.sh index 0c44e2b6..87e83e50 100755 --- a/minikube-aio/install.sh +++ b/minikube-aio/install.sh @@ -32,7 +32,7 @@ function extract { sudo docker load < ${image} done cp calico.yaml /tmp/ - sudo docker images | sort | uniq | tee /tmp/loaded_images + sudo docker images --format "{{.Repository}}:{{.Tag}}" | sort | uniq | tee /tmp/loaded_images cd - } @@ -215,4 +215,10 @@ kubectl label nodes --all ceph-mgr=enabled kubectl label --overwrite namespace default name=default kubectl label --overwrite namespace kube-system name=kube-system kubectl label --overwrite namespace kube-public name=kube-public -sudo docker images | sort | uniq | tee /tmp/images_after_installation +sudo docker images --format "{{.Repository}}:{{.Tag}}" | sort | uniq | tee /tmp/images_after_installation + +if ! cmp -s /tmp/loaded_images /tmp/images_after_installation; then + printf "ERROR: minikube-aio pulls additional images" + diff /tmp/loaded_images /tmp/images_after_installation + exit 1 +fi