Merge branch 'k8s-1-15'

This commit is contained in:
Jeff Geerling 2019-07-06 16:01:01 -05:00
commit 05d1d94e3b
2 changed files with 4 additions and 4 deletions

View File

@ -24,8 +24,8 @@ Available variables are listed below, along with default values (see `defaults/m
Kubernetes packages to be installed on the server. You can either provide a list of package names, or set `name` and `state` to have more control over whether the package is `present`, `absent`, `latest`, etc. Kubernetes packages to be installed on the server. You can either provide a list of package names, or set `name` and `state` to have more control over whether the package is `present`, `absent`, `latest`, etc.
kubernetes_version: '1.13' kubernetes_version: '1.15'
kubernetes_version_rhel_package: '1.13.3' kubernetes_version_rhel_package: '1.15.0'
The minor version of Kubernetes to install. The plain `kubernetes_version` is used to pin an apt package version on Debian, and as the Kubernetes version passed into the `kubeadm init` command (see `kubernetes_version_kubeadm`). The `kubernetes_version_rhel_package` variable must be a specific Kubernetes release, and is used to pin the version on Red Hat / CentOS servers. The minor version of Kubernetes to install. The plain `kubernetes_version` is used to pin an apt package version on Debian, and as the Kubernetes version passed into the `kubeadm init` command (see `kubernetes_version_kubeadm`). The `kubernetes_version_rhel_package` variable must be a specific Kubernetes release, and is used to pin the version on Red Hat / CentOS servers.

View File

@ -9,8 +9,8 @@ kubernetes_packages:
- name: kubernetes-cni - name: kubernetes-cni
state: present state: present
kubernetes_version: '1.13' kubernetes_version: '1.15'
kubernetes_version_rhel_package: '1.13.3' kubernetes_version_rhel_package: '1.15.0'
kubernetes_role: master kubernetes_role: master