Get kubeadm working again
This change fixes several issues with kubeadm, notably the tiller image url/version, as well as fixing the docker python library missing. Change-Id: I35528bd45c08ac8580d9875dc54b300a2137fe73
This commit is contained in:
parent
3b06925560
commit
b70bdd6a71
@ -2,4 +2,5 @@
|
|||||||
tiller:
|
tiller:
|
||||||
- 0.1.0 Initial Chart
|
- 0.1.0 Initial Chart
|
||||||
- 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
|
- 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
|
||||||
|
- 0.1.2 Update tiller image url and version
|
||||||
...
|
...
|
||||||
|
@ -12,10 +12,10 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
appVersion: v2.16.9
|
appVersion: v2.17.0
|
||||||
description: OpenStack-Helm Tiller
|
description: OpenStack-Helm Tiller
|
||||||
name: tiller
|
name: tiller
|
||||||
version: 0.1.1
|
version: 0.1.2
|
||||||
home: https://github.com/kubernetes/helm
|
home: https://github.com/kubernetes/helm
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/kubernetes/helm
|
- https://github.com/kubernetes/helm
|
||||||
|
@ -25,7 +25,7 @@ release_group: null
|
|||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.16.9
|
tiller: ghcr.io/helm/tiller:v2.17.0
|
||||||
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
|
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
|
||||||
image_repo_sync: docker.io/docker:17.07.0
|
image_repo_sync: docker.io/docker:17.07.0
|
||||||
pull_policy: IfNotPresent
|
pull_policy: IfNotPresent
|
||||||
|
@ -85,6 +85,7 @@ RUN set -ex ;\
|
|||||||
# what's deployed in the gates
|
# what's deployed in the gates
|
||||||
pip3 --no-cache-dir install --upgrade \
|
pip3 --no-cache-dir install --upgrade \
|
||||||
requests \
|
requests \
|
||||||
|
docker \
|
||||||
kubernetes \
|
kubernetes \
|
||||||
"ansible==2.5.5" ;\
|
"ansible==2.5.5" ;\
|
||||||
for BINARY in kubectl kubeadm; do \
|
for BINARY in kubectl kubeadm; do \
|
||||||
|
@ -36,7 +36,7 @@ fi
|
|||||||
: ${NET_SUPPORT_LINUXBRIDGE:="true"}
|
: ${NET_SUPPORT_LINUXBRIDGE:="true"}
|
||||||
: ${PVC_SUPPORT_CEPH:="false"}
|
: ${PVC_SUPPORT_CEPH:="false"}
|
||||||
: ${PVC_SUPPORT_NFS:="false"}
|
: ${PVC_SUPPORT_NFS:="false"}
|
||||||
: ${HELM_TILLER_IMAGE:="gcr.io/kubernetes-helm/tiller:${HELM_VERSION}"}
|
: ${HELM_TILLER_IMAGE:="ghcr.io/helm/tiller:${HELM_VERSION}"}
|
||||||
: ${KUBE_VERSION:="${KUBE_VERSION}"}
|
: ${KUBE_VERSION:="${KUBE_VERSION}"}
|
||||||
: ${KUBE_IMAGE_REPO:="k8s.gcr.io"}
|
: ${KUBE_IMAGE_REPO:="k8s.gcr.io"}
|
||||||
: ${KUBE_API_BIND_PORT:="6443"}
|
: ${KUBE_API_BIND_PORT:="6443"}
|
||||||
|
@ -34,7 +34,7 @@ all:
|
|||||||
pv_support_nfs: true
|
pv_support_nfs: true
|
||||||
bind_device: null
|
bind_device: null
|
||||||
helm:
|
helm:
|
||||||
tiller_image: gcr.io/kubernetes-helm/tiller:v2.7.0
|
tiller_image: ghcr.io/helm/tiller:v2.17.0
|
||||||
k8s:
|
k8s:
|
||||||
kubernetesVersion: v1.18.9
|
kubernetesVersion: v1.18.9
|
||||||
imageRepository: k8s.gcr.io
|
imageRepository: k8s.gcr.io
|
||||||
|
Loading…
Reference in New Issue
Block a user