Update external huawei cloud controller to 0.26.8 (#11172)

* Update external huawei cloud controller to 0.26.8

* Update huawei cloud controller templates

* Add security-group-id to config

* git fail

inventory/sample/group_vars/all/huaweicloud.yml

@@ -14,4 +14,4 @@
 
 ## The repo and tag of the external Huawei Cloud Controller image
 # external_huawei_cloud_controller_image_repo: "swr.ap-southeast-1.myhuaweicloud.com"
-# external_huawei_cloud_controller_image_tag: "v0.26.6"
+# external_huawei_cloud_controller_image_tag: "v0.26.8"

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

@@ -16,4 +16,4 @@ external_huaweicloud_cloud: "{{ lookup('env','OS_CLOUD') }}"
 ##    arg2: "value2"
 external_huawei_cloud_controller_extra_args: {}
 external_huawei_cloud_controller_image_repo: "swr.ap-southeast-1.myhuaweicloud.com"
-external_huawei_cloud_controller_image_tag: "v0.26.6"
+external_huawei_cloud_controller_image_tag: "v0.26.8"

roles/kubernetes-apps/external_cloud_controller/huaweicloud/templates/external-huawei-cloud-config.j2

@@ -21,3 +21,6 @@ subnet-id={{ external_huaweicloud_lbaas_subnet_id }}
 {% if external_huaweicloud_lbaas_network_id is defined %}
 id={{ external_huaweicloud_lbaas_network_id }}
 {% endif %}
+{% if external_huaweicloud_security_group_id is defined %}
+security-group-id={{ external_huaweicloud_security_group_id }}
+{% endif %}

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

@@ -47,6 +47,11 @@ spec:
             - --cloud-config=$(CLOUD_CONFIG)
             - --cloud-provider=huaweicloud
             - --use-service-account-credentials=true
+            - --node-status-update-frequency=5s
+            - --node-monitor-period=5s
+            - --leader-elect-lease-duration=30s
+            - --leader-elect-renew-deadline=20s
+            - --leader-elect-retry-period=2s
 {% for key, value in external_huawei_cloud_controller_extra_args.items() %}
             - "{{ '--' + key + '=' + value }}"
 {% endfor %}

roles/kubernetes-apps/external_cloud_controller/huaweicloud/templates/external-huawei-cloud-controller-manager-role-bindings.yml.j2

@@ -1,16 +1,12 @@
-apiVersion: v1
+kind: ClusterRoleBinding
-items:
+apiVersion: rbac.authorization.k8s.io/v1
-- apiVersion: rbac.authorization.k8s.io/v1
+metadata:
-  kind: ClusterRoleBinding
-  metadata:
   name: system:cloud-controller-manager
-  roleRef:
+roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: system:cloud-controller-manager
-  subjects:
+subjects:
   - kind: ServiceAccount
     name: cloud-controller-manager
     namespace: kube-system
-kind: List
-metadata: {}

roles/kubernetes-apps/external_cloud_controller/huaweicloud/templates/external-huawei-cloud-controller-manager-roles.yml.j2

@@ -1,10 +1,8 @@
-apiVersion: v1
+apiVersion: rbac.authorization.k8s.io/v1
-items:
+kind: ClusterRole
-- apiVersion: rbac.authorization.k8s.io/v1
+metadata:
-  kind: ClusterRole
-  metadata:
   name: system:cloud-controller-manager
-  rules:
+rules:
   - resources:
       - tokenreviews
     verbs:
@@ -113,5 +111,3 @@ items:
       - watch
     apiGroups:
       - discovery.k8s.io
-kind: List
-metadata: {}