External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-08 01:47:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update external huawei cloud controller to 0.26.8 (#11172)

Browse Source 
* Update external huawei cloud controller to 0.26.8

* Update huawei cloud controller templates

* Add security-group-id to config

* git fail
This commit is contained in:
Daniel Strufe
2024-05-08 10:36:31 +02:00
committed by GitHub
parent d94f3ce965
commit 0b0faf8f72
6 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inventory/sample/group_vars/all/huaweicloud.yml
View File

@@ -14,4 +14,4 @@
## The repo and tag of the external Huawei Cloud Controller image ## 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_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"

2
roles/kubernetes-apps/external_cloud_controller/huaweicloud/defaults/main.yml
View File

@@ -16,4 +16,4 @@ external_huaweicloud_cloud: "{{ lookup('env','OS_CLOUD') }}"
## arg2: "value2" ## arg2: "value2"
external_huawei_cloud_controller_extra_args: {} external_huawei_cloud_controller_extra_args: {}
external_huawei_cloud_controller_image_repo: "swr.ap-southeast-1.myhuaweicloud.com" 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"

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

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

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

@@ -47,6 +47,11 @@ spec:
- --cloud-config=$(CLOUD_CONFIG) - --cloud-config=$(CLOUD_CONFIG)
- --cloud-provider=huaweicloud - --cloud-provider=huaweicloud
- --use-service-account-credentials=true - --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() %} {% for key, value in external_huawei_cloud_controller_extra_args.items() %}
- "{{ '--' + key + '=' + value }}" - "{{ '--' + key + '=' + value }}"
{% endfor %} {% endfor %}

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

@@ -1,7 +1,5 @@
apiVersion: v1
items:
- apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: system:cloud-controller-manager name: system:cloud-controller-manager
roleRef: roleRef:
@@ -12,5 +10,3 @@ items:
- kind: ServiceAccount - kind: ServiceAccount
name: cloud-controller-manager name: cloud-controller-manager
namespace: kube-system namespace: kube-system
kind: List
metadata: {}

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

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