Skip to content

Commit

Permalink
Update versions to kubernetes 1.15.3 and the latest documents
Browse files Browse the repository at this point in the history
Version combinations:
  docker-ce-18.06.2.ce
  kubeadm/kubelet/kubectl: 1.15.3
  flannel v0.11+ (62e44c867a)
  • Loading branch information
kskmori committed Aug 29, 2019
1 parent 1729ab9 commit 1d9a9b6
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 18 deletions.
9 changes: 8 additions & 1 deletion roles/docker-ce-install/tasks/main.yml
Expand Up @@ -34,9 +34,16 @@

- name: install docker ce
yum:
name=docker-ce-18.06.1.ce
name=docker-ce-18.06.2.ce
state=present

- name: create /etc/docker directory
file: path=/etc/docker state=directory
- name: setup daemon
template:
src: daemon.json
dest: /etc/docker/daemon.json

- name: enable docker
systemd:
name: docker
Expand Down
11 changes: 11 additions & 0 deletions roles/docker-ce-install/templates/daemon.json
@@ -0,0 +1,11 @@
{
"exec-opts": ["native.cgroupdriver=systemd"],
"log-driver": "json-file",
"log-opts": {
"max-size": "100m"
},
"storage-driver": "overlay2",
"storage-opts": [
"overlay2.override_kernel_check=true"
]
}
8 changes: 4 additions & 4 deletions roles/kube-single-master/tasks/main.yml
Expand Up @@ -13,8 +13,8 @@
#
# this config includes the tuning for shorter timeouts of node down
# see the documents
# https://v1-11.docs.kubernetes.io/docs/setup/independent/control-plane-flags/
# https://v1-11.docs.kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/
# https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/control-plane-flags/
# https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file
- name: prepare configuration file
template:
src: kubeadm-config.yml.j2
Expand All @@ -39,14 +39,14 @@

# Install Flannel pod network add-on
# equivalent to
# command: kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/v0.10.0/Documentation/kube-flannel.yml
# command: kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/62e44c867a2846fefb68bd5f178daf4da3095ccb/Documentation/kube-flannel.yml
# but instead download it once and apply from the local file
# to allow to customize the iface option to support vagrant environment.
# https://kubernetes.io/docs/setup/independent/troubleshooting-kubeadm/#default-nic-when-using-flannel-as-the-pod-network-in-vagrant
#
- name: download Flannel pod network add-on
get_url:
url: https://raw.githubusercontent.com/coreos/flannel/v0.10.0/Documentation/kube-flannel.yml
url: https://raw.githubusercontent.com/coreos/flannel/62e44c867a2846fefb68bd5f178daf4da3095ccb/Documentation/kube-flannel.yml
dest: /tmp/kube-flannel.yml

- name: customize Flannel iface (if necessary)
Expand Down
23 changes: 14 additions & 9 deletions roles/kube-single-master/templates/kubeadm-config.yml.j2
@@ -1,12 +1,17 @@
apiVersion: kubeadm.k8s.io/v1alpha2
kind: MasterConfiguration
kubernetesVersion: v1.11.0
metadata:
name: 1.11-sample
api:
apiVersion: kubeadm.k8s.io/v1beta2
kind: InitConfiguration
localAPIEndpoint:
advertiseAddress: {{ NODE_IP }}
---
apiVersion: kubeadm.k8s.io/v1beta2
kind: ClusterConfiguration
kubernetesVersion: v1.15.3
apiServer:
extraArgs:
advertise-address: {{ NODE_IP }}
networking:
podSubnet: {{ POD_NETWORK_CIDR }}
controllerManagerExtraArgs:
node-monitor-grace-period: "20s"
pod-eviction-timeout: "40s"
controllerManager:
extraArgs:
node-monitor-grace-period: "20s"
pod-eviction-timeout: "40s"
9 changes: 5 additions & 4 deletions roles/kubernetes-install/tasks/main.yml
Expand Up @@ -14,6 +14,8 @@
# https://github.com/ansible/ansible/issues/20711
- name: update yum cache to enable gpg keys
command: yum -q makecache -y --disablerepo='*' --enablerepo=kubernetes
args:
warn: false

# Install kubeadm, kubelet and kubectl
#
Expand All @@ -27,10 +29,9 @@
state=present
vars:
packages:
- kubelet-1.11.3
- kubeadm-1.11.3
- kubectl-1.11.3
- kubernetes-cni-0.6.0
- kubelet-1.15.3
- kubeadm-1.15.3
- kubectl-1.15.3

# additional configuration for kubelet
# see. https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/#using-internal-ips-in-your-cluster
Expand Down
4 changes: 4 additions & 0 deletions roles/os-config/tasks/main.yml
Expand Up @@ -37,6 +37,10 @@
line: "SELINUX=permissive"
state: present

- name: make sure br_netfilter module is loaded
command: modprobe br_netfilter
changed_when: false

- name: workaround of routing issues
template:
src: k8s.conf
Expand Down

0 comments on commit 1d9a9b6

Please sign in to comment.