Issue #18: Attempt to fix version pinning issues on RedHat and Debian.

This commit is contained in:
Jeff Geerling 2018-09-27 23:19:56 -05:00
parent 0bb0604b61
commit fad8281b98
8 changed files with 43 additions and 3 deletions

View File

@ -9,7 +9,9 @@ env:
- MOLECULE_DISTRO: centos7 - MOLECULE_DISTRO: centos7
MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd
- MOLECULE_DISTRO: ubuntu1604 - MOLECULE_DISTRO: ubuntu1604
MOLECULE_DOCKER_COMMAND: /lib/systemd/systemd
- MOLECULE_DISTRO: debian9 - MOLECULE_DISTRO: debian9
MOLECULE_DOCKER_COMMAND: /lib/systemd/systemd
install: install:
# Install test dependencies. # Install test dependencies.

View File

@ -15,6 +15,8 @@ Available variables are listed below, along with default values (see `defaults/m
kubernetes_packages: kubernetes_packages:
- name: kubelet - name: kubelet
state: present state: present
- name: kubectl
state: present
- name: kubeadm - name: kubeadm
state: present state: present
- name: kubernetes-cni - name: kubernetes-cni
@ -22,6 +24,11 @@ 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.11'
kubernetes_version_rhel_package: '1.11.3'
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.
kubernetes_role: master kubernetes_role: master
Whether the particular server will serve as a Kubernetes `master` (default) or `node`. The master will have `kubeadm init` run on it to intialize the entire K8s control plane, while `node`s will have `kubeadm join` run on them to join them to the `master`. Whether the particular server will serve as a Kubernetes `master` (default) or `node`. The master will have `kubeadm init` run on it to intialize the entire K8s control plane, while `node`s will have `kubeadm join` run on them to join them to the `master`.
@ -45,7 +52,7 @@ Whether to show extra debug info in Ansible's logs (e.g. the output of the `kube
kubernetes_pod_network_cidr: '10.244.0.0/16' kubernetes_pod_network_cidr: '10.244.0.0/16'
kubernetes_apiserver_advertise_address: '' kubernetes_apiserver_advertise_address: ''
kubernetes_version: 'stable-1.11' kubernetes_version_kubeadm: 'stable-{{ kubernetes_version }}'
kubernetes_ignore_preflight_errors: 'all' kubernetes_ignore_preflight_errors: 'all'
Options passed to `kubeadm init` when initializing the Kubernetes master. The `apiserver_advertise_address` defaults to `ansible_default_ipv4.address` if it's left empty. Options passed to `kubeadm init` when initializing the Kubernetes master. The `apiserver_advertise_address` defaults to `ansible_default_ipv4.address` if it's left empty.

View File

@ -9,6 +9,9 @@ kubernetes_packages:
- name: kubernetes-cni - name: kubernetes-cni
state: present state: present
kubernetes_version: '1.11'
kubernetes_version_rhel_package: '1.11.3'
kubernetes_role: master kubernetes_role: master
kubernetes_kubelet_extra_args: "" kubernetes_kubelet_extra_args: ""
@ -19,7 +22,7 @@ kuberenetes_debug: false
kubernetes_pod_network_cidr: '10.244.0.0/16' kubernetes_pod_network_cidr: '10.244.0.0/16'
kubernetes_apiserver_advertise_address: '' kubernetes_apiserver_advertise_address: ''
kubernetes_version: 'stable-1.11' kubernetes_version_kubeadm: 'stable-{{ kubernetes_version }}'
kubernetes_ignore_preflight_errors: 'all' kubernetes_ignore_preflight_errors: 'all'
kubernetes_apt_release_channel: main kubernetes_apt_release_channel: main

View File

@ -11,6 +11,9 @@ platforms:
- name: instance - name: instance
image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"} command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"}
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /var/lib/docker
privileged: true privileged: true
pre_build_image: true pre_build_image: true
provisioner: provisioner:

View File

@ -4,7 +4,7 @@
kubeadm init kubeadm init
--pod-network-cidr={{ kubernetes_pod_network_cidr }} --pod-network-cidr={{ kubernetes_pod_network_cidr }}
--apiserver-advertise-address={{ kubernetes_apiserver_advertise_address | default(ansible_default_ipv4.address) }} --apiserver-advertise-address={{ kubernetes_apiserver_advertise_address | default(ansible_default_ipv4.address) }}
--kubernetes-version {{ kubernetes_version }} --kubernetes-version {{ kubernetes_version_kubeadm }}
--ignore-preflight-errors={{ kubernetes_ignore_preflight_errors }} --ignore-preflight-errors={{ kubernetes_ignore_preflight_errors }}
register: kubeadmin_init register: kubeadmin_init
failed_when: false failed_when: false

View File

@ -18,3 +18,8 @@
repo: "{{ kubernetes_apt_repository }}" repo: "{{ kubernetes_apt_repository }}"
state: present state: present
update_cache: false update_cache: false
- name: Add Kubernetes apt preferences file to pin a version.
template:
src: apt-preferences-kubernetes.j2
dest: /etc/apt/preferences.d/kubernetes

View File

@ -0,0 +1,11 @@
Package: kubectl
Pin: version {{ kubernetes_version }}.*
Pin-Priority: 1000
Package: kubeadm
Pin: version {{ kubernetes_version }}.*
Pin-Priority: 1000
Package: kubelet
Pin: version {{ kubernetes_version }}.*
Pin-Priority: 1000

View File

@ -1,2 +1,11 @@
--- ---
kubelet_environment_file_path: /etc/sysconfig/kubelet kubelet_environment_file_path: /etc/sysconfig/kubelet
kubernetes_packages:
- name: kubelet-{{ kubernetes_version_rhel_package }}-0
state: present
- name: kubectl-{{ kubernetes_version_rhel_package }}-0
state: present
- name: kubeadm-{{ kubernetes_version_rhel_package }}-0
state: present
- name: kubernetes-cni
state: present