Merge branch 'master' of https://github.com/kubernetes-sigs/kubespray

* 'master' of https://github.com/kubernetes-sigs/kubespray: (22 commits)
  Remove runtime-config from kubeadm if empty (kubernetes-sigs#6311)
  Update deprecated api (kubernetes-sigs#6245)
  Update kube-router to 1.0.0 (kubernetes-sigs#6211)
  Fix kubelet cgroup driver detection for crio (kubernetes-sigs#6331)
  Update hashes and set default version to 1.18.5 (kubernetes-sigs#6335)
  Change MetalLB to one of addons (kubernetes-sigs#6238)
  Update calico to 1.15.0 + minor update to kube-ovn/weave (kubernetes-sigs#6306)
  Add .editorconfig file (kubernetes-sigs#6307)
  Use NetworkManager to manage resolv.conf in FedoraCoreOS (kubernetes-sigs#6291)
  Add USE_REAL_HOSTNAME to inventory.py (kubernetes-sigs#6293)
  Cleanup OpenStack network things (kubernetes-sigs#6283)
  Add support for dns_etchosts (kubernetes-sigs#6236)
  kube_encryption_resources must be output as yaml (kubernetes-sigs#6309)
  Gather ansible_default_ipv4 for specific groups (kubernetes-sigs#6318)
  added azure_cloud parameter to Azure's cloud_config (kubernetes-sigs#6321)
  Fix some doc links (kubernetes-sigs#6328)
  Use `connection: local` when `delegate_to: localhost` (kubernetes-sigs#6322)
  Add /dev volume (kubernetes-sigs#6319)
  Update cilium to 1.8.0 (kubernetes-sigs#6314)
  fix use of ansible tags (kubernetes-sigs#6316)
  ...

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*.{yaml,yml,yml.j2,yaml.j2}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+
+[{Dockerfile}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8

.gitlab-ci/terraform.yml

@@ -171,4 +171,4 @@ tf-elastx_ubuntu18-calico:
     TF_VAR_flavor_k8s_master: 3f73fc93-ec61-4808-88df-2580d94c1a9b    # v1-standard-2
     TF_VAR_flavor_k8s_node: 3f73fc93-ec61-4808-88df-2580d94c1a9b      # v1-standard-2
     TF_VAR_image: ubuntu-18.04-server-latest
-    TF_VAR_k8s_allowed_remote_ips: '["0.0.0.0/0"]'
+    TF_VAR_k8s_allowed_remote_ips: '["0.0.0.0/0"]'

.gitlab-ci/vagrant.yml

@@ -51,4 +51,4 @@ vagrant_ubuntu18-weave-medium:
 vagrant_ubuntu20-flannel:
   stage: deploy-part2
   extends: .vagrant
-  when: on_success
+  when: on_success

Dockerfile

@@ -6,12 +6,12 @@ RUN apt update -y && \
     apt install -y \
     libssl-dev python3-dev sshpass apt-transport-https jq moreutils \
     ca-certificates curl gnupg2 software-properties-common python3-pip rsync
-RUN  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
-     add-apt-repository \
-     "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-     $(lsb_release -cs) \
-     stable" \
-     && apt update -y && apt-get install docker-ce -y
+RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
+    add-apt-repository \
+    "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+    $(lsb_release -cs) \
+    stable" \
+    && apt update -y && apt-get install docker-ce -y
 COPY . .
 RUN /usr/bin/python3 -m pip install pip -U && /usr/bin/python3 -m pip install -r tests/requirements.txt && python3 -m pip install -r requirements.txt && update-alternatives --install /usr/bin/python python /usr/bin/python3 1
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.5/bin/linux/amd64/kubectl \

README.md

@@ -115,22 +115,22 @@ Note: Upstart/SysV init based OS types are not supported.
 ## Supported Components
 
 - Core
-  - [kubernetes](https://github.com/kubernetes/kubernetes) v1.18.4
+  - [kubernetes](https://github.com/kubernetes/kubernetes) v1.18.5
   - [etcd](https://github.com/coreos/etcd) v3.3.12
   - [docker](https://www.docker.com/) v19.03 (see note)
   - [containerd](https://containerd.io/) v1.2.13
   - [cri-o](http://cri-o.io/) v1.17 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
 - Network Plugin
   - [cni-plugins](https://github.com/containernetworking/plugins) v0.8.6
-  - [calico](https://github.com/projectcalico/calico) v3.14.1
+  - [calico](https://github.com/projectcalico/calico) v3.15.0
   - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
-  - [cilium](https://github.com/cilium/cilium) v1.7.4
+  - [cilium](https://github.com/cilium/cilium) v1.8.0
   - [contiv](https://github.com/contiv/install) v1.2.1
   - [flanneld](https://github.com/coreos/flannel) v0.12.0
-  - [kube-ovn](https://github.com/alauda/kube-ovn) v1.2.0
-  - [kube-router](https://github.com/cloudnativelabs/kube-router) v0.4.0
+  - [kube-ovn](https://github.com/alauda/kube-ovn) v1.2.1
+  - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.0.0
   - [multus](https://github.com/intel/multus-cni) v3.4.2
-  - [weave](https://github.com/weaveworks/weave) v2.6.4
+  - [weave](https://github.com/weaveworks/weave) v2.6.5
 - Application
   - [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11
   - [rbd-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.1-k8s1.11

_config.yml

@@ -1,2 +1,2 @@
 ---
-theme: jekyll-theme-slate
+theme: jekyll-theme-slate

cluster.yml

@@ -4,6 +4,7 @@
 
 - hosts: all
   gather_facts: false
+  tags: always
   tasks:
     - name: "Set up proxy environment"
       set_fact:
@@ -33,6 +34,7 @@
     - { role: bootstrap-os, tags: bootstrap-os}
 
 - name: Gather facts
+  tags: always
   import_playbook: facts.yml
 
 - hosts: k8s-cluster:etcd

contrib/inventory_builder/inventory.py

@@ -41,6 +41,7 @@
 
 import os
 import re
+import subprocess
 import sys
 
 ROLES = ['all', 'kube-master', 'kube-node', 'etcd', 'k8s-cluster',
@@ -69,6 +70,7 @@ def get_var_as_bool(name, default):
 
 DEBUG = get_var_as_bool("DEBUG", True)
 HOST_PREFIX = os.environ.get("HOST_PREFIX", "node")
+USE_REAL_HOSTNAME = get_var_as_bool("USE_REAL_HOSTNAME", False)
 
 # Configurable as shell vars end
 
@@ -167,6 +169,7 @@ def build_hostnames(self, changed_hosts):
 
         # FIXME(mattymo): Fix condition where delete then add reuses highest id
         next_host_id = highest_host_id + 1
+        next_host = ""
 
         all_hosts = existing_hosts.copy()
         for host in changed_hosts:
@@ -191,8 +194,14 @@ def build_hostnames(self, changed_hosts):
                     self.debug("Skipping existing host {0}.".format(ip))
                     continue
 
-                next_host = "{0}{1}".format(HOST_PREFIX, next_host_id)
-                next_host_id += 1
+                if USE_REAL_HOSTNAME:
+                    cmd = ("ssh -oStrictHostKeyChecking=no "
+                           + access_ip + " 'hostname -s'")
+                    next_host = subprocess.check_output(cmd, shell=True)
+                    next_host = next_host.strip().decode('ascii')
+                else:
+                    next_host = "{0}{1}".format(HOST_PREFIX, next_host_id)
+                    next_host_id += 1
                 all_hosts[next_host] = {'ansible_host': access_ip,
                                         'ip': ip,
                                         'access_ip': access_ip}