openstack
/
openstack-helm-images
Code Issues Proposed changes

Merge "Pull tiller from correct repository"

This commit is contained in:
Zuul 2021-09-02 17:38:20 +00:00 committed by Gerrit Code Review
parent ecf5f71df2 6c1ef655b0
commit 11046331a7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minikube-aio/images.txt
View File

@ -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

10
minikube-aio/install.sh
View File

@ -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