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

* 'master' of https://github.com/kubernetes-sigs/kubespray:
  Update triage/support label references to kind/support (kubernetes-sigs#6792)
  Update kube-router to 1.1.0 (kubernetes-sigs#6793)
  harden reset to work in more cases (kubernetes-sigs#6781)
  Add extra arguments variables for openstack and vsphere cloud controller manager daemonsets (kubernetes-sigs#6783)
  Update cilium with minor fix for CVE (kubernetes-sigs#6784)
  Add `plugins/mitogen` to `.gitignore` (kubernetes-sigs#6774)

.github/ISSUE_TEMPLATE/support.md

@@ -1,7 +1,7 @@
 ---
 name: Support Request
 about: Support request or question relating to Kubespray
-labels: triage/support
+labels: kind/support
 
 ---
 

.gitignore

@@ -15,6 +15,7 @@ contrib/terraform/aws/credentials.tfvars
 **/*.sw[pon]
 *~
 vagrant/
+plugins/mitogen
 
 # Ansible inventory
 inventory/*

README.md

@@ -122,14 +122,14 @@ Note: Upstart/SysV init based OS types are not supported.
   - [containerd](https://containerd.io/) v1.3.7
   - [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
+  - [cni-plugins](https://github.com/containernetworking/plugins) v0.8.7
   - [calico](https://github.com/projectcalico/calico) v3.16.1
   - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
-  - [cilium](https://github.com/cilium/cilium) v1.8.3
+  - [cilium](https://github.com/cilium/cilium) v1.8.4
   - [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.3.0
-  - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.0.1
+  - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.1.0
   - [multus](https://github.com/intel/multus-cni) v3.6.0
   - [ovn4nfv](https://github.com/opnfv/ovn4nfv-k8s-plugin) v1.1.0
   - [weave](https://github.com/weaveworks/weave) v2.7.0

roles/download/defaults/main.yml

@@ -79,9 +79,9 @@ cni_version: "v0.8.7"
 weave_version: 2.7.0
 pod_infra_version: "3.3"
 contiv_version: 1.2.1
-cilium_version: "v1.8.3"
+cilium_version: "v1.8.4"
 kube_ovn_version: "v1.3.0"
-kube_router_version: "v1.0.1"
+kube_router_version: "v1.1.0"
 multus_version: "v3.6"
 ovn4nfv_ovn_image_version: "v1.0.0"
 ovn4nfv_k8s_plugin_image_version: "v1.1.0"

roles/kubernetes-apps/external_cloud_controller/openstack/defaults/main.yml

@@ -12,4 +12,10 @@ external_openstack_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}"
 external_openstack_domain_id: "{{ lookup('env','OS_USER_DOMAIN_ID') }}"
 external_openstack_cacert: "{{ lookup('env','OS_CACERT') }}"
 
+## A dictionary of extra arguments to add to the openstack cloud controller manager daemonset
+## Format:
+##  external_openstack_cloud_controller_extra_args:
+##    arg1: "value1"
+##    arg2: "value2"
+external_openstack_cloud_controller_extra_args: {}
 external_openstack_cloud_controller_image_tag: "v1.18.2"

roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2

@@ -44,6 +44,9 @@ spec:
             - --cloud-provider=openstack
             - --use-service-account-credentials=true
             - --address=127.0.0.1
+{% for key, value in external_openstack_cloud_controller_extra_args.items() %}
+            - "{{ '--' + key + '=' + value }}"
+{% endfor %}
           volumeMounts:
             - mountPath: /etc/kubernetes/pki
               name: k8s-certs

roles/kubernetes-apps/external_cloud_controller/vsphere/defaults/main.yml

@@ -2,4 +2,10 @@
 external_vsphere_vcenter_port: "443"
 external_vsphere_insecure: "true"
 
+## A dictionary of extra arguments to add to the vsphere cloud controller manager daemonset
+## Format:
+##  external_vsphere_cloud_controller_extra_args:
+##    arg1: "value1"
+##    arg2: "value2"
+external_vsphere_cloud_controller_extra_args: {}
 external_vsphere_cloud_controller_image_tag: "latest"

roles/kubernetes-apps/external_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2

@@ -41,6 +41,9 @@ spec:
             - --v=2
             - --cloud-provider=vsphere
             - --cloud-config=/etc/cloud/vsphere.conf
+{% for key, value in external_vsphere_cloud_controller_extra_args.items() %}
+            - "{{ '--' + key + '=' + value }}"
+{% endfor %}
           volumeMounts:
             - mountPath: /etc/cloud
               name: vsphere-config-volume

roles/network_plugin/kube-router/templates/kube-router.yml.j2

@@ -28,7 +28,7 @@ spec:
         prometheus.io/scrape: "true"
 {% endif %}
     spec:
-      priorityClassName: system-cluster-critical
+      priorityClassName: system-node-critical
       serviceAccountName: kube-router
       containers:
       - name: kube-router

roles/reset/tasks/main.yml

@@ -147,13 +147,15 @@
     warn: false
   check_mode: no
   register: mounted_dirs
+  failed_when: false
   tags:
     - mounts
 
 - name: reset | unmount kubelet dirs  # noqa 301
   command: umount -f {{ item }}
   with_items: "{{ mounted_dirs.stdout_lines }}"
   register: umount_dir
+  when: mounted_dirs
   retries: 4
   until: umount_dir.rc == 0
   delay: 5