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
+  name: system:cloud-controller-manager
-  metadata:
+roleRef:
-    name: system:cloud-controller-manager
+  apiGroup: rbac.authorization.k8s.io
-  roleRef:
+  kind: ClusterRole
-    apiGroup: rbac.authorization.k8s.io
+  name: system:cloud-controller-manager
-    kind: ClusterRole
+subjects:
-    name: system:cloud-controller-manager
-  subjects:
   - kind: ServiceAccount
     name: cloud-controller-manager
-    namespace: kube-system
+    namespace: kube-system
-kind: List
-metadata: {}

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

@@ -1,117 +1,113 @@
-apiVersion: v1
+apiVersion: rbac.authorization.k8s.io/v1
-items:
+kind: ClusterRole
-- apiVersion: rbac.authorization.k8s.io/v1
+metadata:
-  kind: ClusterRole
+  name: system:cloud-controller-manager
-  metadata:
+rules:
-    name: system:cloud-controller-manager
-  rules:
   - resources:
-    - tokenreviews
+      - tokenreviews
     verbs:
-    - get
+      - get
-    - list
+      - list
-    - watch
+      - watch
-    - create
+      - create
-    - update
+      - update
-    - patch
+      - patch
     apiGroups:
-    - authentication.k8s.io
+      - authentication.k8s.io
   - resources:
-    - configmaps
+      - configmaps
-    - endpoints
+      - endpoints
-    - pods
+      - pods
-    - services
+      - services
-    - secrets
+      - secrets
-    - serviceaccounts
+      - serviceaccounts
-    - serviceaccounts/token
+      - serviceaccounts/token
     verbs:
-    - get
+      - get
-    - list
+      - list
-    - watch
+      - watch
-    - create
+      - create
-    - update
+      - update
-    - patch
+      - patch
     apiGroups:
-    - ''
+      - ''
   - resources:
-    - nodes
+      - nodes
     verbs:
-    - get
+      - get
-    - list
+      - list
-    - watch
+      - watch
-    - delete
+      - delete
-    - patch
+      - patch
-    - update
+      - update
     apiGroups:
-    - ''
+      - ''
   - resources:
-    - services/status
+      - services/status
-    - pods/status
+      - pods/status
     verbs:
-    - update
+      - update
-    - patch
+      - patch
     apiGroups:
-    - ''
+      - ''
   - resources:
-    - nodes/status
+      - nodes/status
     verbs:
-    - patch
+      - patch
-    - update
+      - update
     apiGroups:
-    - ''
+      - ''
   - resources:
-    - events
+      - events
-    - endpoints
+      - endpoints
     verbs:
-    - create
+      - create
-    - patch
+      - patch
-    - update
+      - update
     apiGroups:
-    - ''
+      - ''
   - resources:
-    - leases
+      - leases
     verbs:
-    - get
+      - get
-    - update
+      - update
-    - create
+      - create
-    - delete
+      - delete
     apiGroups:
-    - coordination.k8s.io
+      - coordination.k8s.io
   - resources:
-    - customresourcedefinitions
+      - customresourcedefinitions
     verbs:
-    - get
+      - get
-    - update
+      - update
-    - create
+      - create
-    - delete
+      - delete
     apiGroups:
       - apiextensions.k8s.io
   - resources:
-    - ingresses
+      - ingresses
     verbs:
-    - get
+      - get
-    - list
+      - list
-    - watch
+      - watch
-    - update
+      - update
-    - create
+      - create
-    - patch
+      - patch
-    - delete
+      - delete
     apiGroups:
-    - networking.k8s.io
+      - networking.k8s.io
   - resources:
-    - ingresses/status
+      - ingresses/status
     verbs:
-    - update
+      - update
-    - patch
+      - patch
     apiGroups:
-    - networking.k8s.io
+      - networking.k8s.io
   - resources:
-    - endpointslices
+      - endpointslices
     verbs:
-    - get
+      - get
-    - list
+      - list
-    - watch
+      - watch
     apiGroups:
-    - discovery.k8s.io
+      - discovery.k8s.io
-kind: List
-metadata: {}