openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Changing the kube version to 1.18.9"

Browse Source
This commit is contained in:
Zuul 2020-11-27 19:20:56 +00:00 committed by Gerrit Code Review
commit 5600c76e0b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/build-images/defaults/main.yml
View File

@ -12,7 +12,7 @@
--- ---
version: version:
kubernetes: v1.16.2 kubernetes: v1.18.9
helm: v2.13.0 helm: v2.13.0
cni: v0.6.0 cni: v0.6.0

2
tools/images/kubeadm-aio/Dockerfile
View File

@ -35,7 +35,7 @@ ENV GOOGLE_KUBERNETES_REPO_URL ${GOOGLE_KUBERNETES_REPO_URL}
ARG GOOGLE_HELM_REPO_URL=https://storage.googleapis.com/kubernetes-helm ARG GOOGLE_HELM_REPO_URL=https://storage.googleapis.com/kubernetes-helm
ENV GOOGLE_HELM_REPO_URL ${GOOGLE_HELM_REPO_URL} ENV GOOGLE_HELM_REPO_URL ${GOOGLE_HELM_REPO_URL}
ARG KUBE_VERSION="v1.16.2" ARG KUBE_VERSION="v1.18.9"
ENV KUBE_VERSION ${KUBE_VERSION} ENV KUBE_VERSION ${KUBE_VERSION}
ARG CNI_VERSION="v0.6.0" ARG CNI_VERSION="v0.6.0"

2
tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml
View File

@ -36,7 +36,7 @@ all:
helm: helm:
tiller_image: gcr.io/kubernetes-helm/tiller:v2.7.0 tiller_image: gcr.io/kubernetes-helm/tiller:v2.7.0
k8s: k8s:
kubernetesVersion: v1.16.2 kubernetesVersion: v1.18.9
imageRepository: gcr.io/google_containers imageRepository: gcr.io/google_containers
certificatesDir: /etc/kubernetes/pki certificatesDir: /etc/kubernetes/pki
selfHosted: false selfHosted: false