gstykalin/kube-forge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to latest 2.26.0 kubespray version and add dns zones settings to coredns

Browse Source
This commit is contained in:
George Stykalin
2024-12-14 21:56:19 +03:00
parent be9c8a28fd
commit 4294f52703
368 changed files with 37761 additions and 2942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kubespray/project/roles/kubernetes-apps/external_cloud_controller/hcloud/tasks/main.yml
View File

@@ -4,7 +4,7 @@
src: "{{ item.file }}.j2"
dest: "{{ kube_config_dir }}/{{ item.file }}"
group: "{{ kube_cert_group }}"
mode: 0640
mode: "0640"
with_items:
- {name: external-hcloud-cloud-secret, file: external-hcloud-cloud-secret.yml}
- {name: external-hcloud-cloud-service-account, file: external-hcloud-cloud-service-account.yml}

2
kubespray/project/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"
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"

2
kubespray/project/roles/kubernetes-apps/external_cloud_controller/huaweicloud/tasks/main.yml
View File

@@ -24,7 +24,7 @@
src: "{{ item.file }}.j2"
dest: "{{ kube_config_dir }}/{{ item.file }}"
group: "{{ kube_cert_group }}"
mode: 0640
mode: "0640"
with_items:
- {name: external-huawei-cloud-config-secret, file: external-huawei-cloud-config-secret.yml}
- {name: external-huawei-cloud-controller-manager-roles, file: external-huawei-cloud-controller-manager-roles.yml}

3
kubespray/project/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 %}
id={{ external_huaweicloud_lbaas_network_id }}
{% endif %}
{% if external_huaweicloud_security_group_id is defined %}
security-group-id={{ external_huaweicloud_security_group_id }}
{% endif %}

5
kubespray/project/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-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 %}

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

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

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

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

3
kubespray/project/roles/kubernetes-apps/external_cloud_controller/openstack/defaults/main.yml
View File

@@ -21,5 +21,6 @@ external_openstack_cacert: "{{ lookup('env', 'OS_CACERT') }}"
## arg1: "value1"
## arg2: "value2"
external_openstack_cloud_controller_extra_args: {}
external_openstack_cloud_controller_image_tag: "v1.25.3"
external_openstack_cloud_controller_image_tag: "v1.30.0"
external_openstack_cloud_controller_bind_address: 127.0.0.1
external_openstack_cloud_controller_dns_policy: ClusterFirst

2
kubespray/project/roles/kubernetes-apps/external_cloud_controller/openstack/tasks/main.yml
View File

@@ -24,7 +24,7 @@
src: "{{ item.file }}.j2"
dest: "{{ kube_config_dir }}/{{ item.file }}"
group: "{{ kube_cert_group }}"
mode: 0640
mode: "0640"
with_items:
- {name: external-openstack-cloud-config-secret, file: external-openstack-cloud-config-secret.yml}
- {name: external-openstack-cloud-controller-manager-roles, file: external-openstack-cloud-controller-manager-roles.yml}

6
kubespray/project/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
View File

@@ -36,7 +36,7 @@ spec:
serviceAccountName: cloud-controller-manager
containers:
- name: openstack-cloud-controller-manager
image: {{ docker_image_repo }}/k8scloudprovider/openstack-cloud-controller-manager:{{ external_openstack_cloud_controller_image_tag }}
image: {{ external_openstack_cloud_controller_image_repo }}:{{ external_openstack_cloud_controller_image_tag }}
args:
- /bin/openstack-cloud-controller-manager
- --v=1
@@ -81,7 +81,9 @@ spec:
- name: CLOUD_CONFIG
value: /etc/config/cloud.conf
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
{% if external_openstack_cloud_controller_dns_policy is defined %}
dnsPolicy: {{ external_openstack_cloud_controller_dns_policy }}
{% endif %}
volumes:
{% if kubelet_flexvolumes_plugins_dir is defined %}
- name: flexvolume-dir

4
kubespray/project/roles/kubernetes-apps/external_cloud_controller/vsphere/tasks/main.yml
View File

@@ -6,7 +6,7 @@
template:
src: "{{ item }}.j2"
dest: "{{ kube_config_dir }}/{{ item }}"
mode: 0640
mode: "0640"
with_items:
- external-vsphere-cpi-cloud-config
when: inventory_hostname == groups['kube_control_plane'][0]
@@ -15,7 +15,7 @@
template:
src: "{{ item }}.j2"
dest: "{{ kube_config_dir }}/{{ item }}"
mode: 0644
mode: "0644"
with_items:
- external-vsphere-cpi-cloud-config-secret.yml
- external-vsphere-cloud-controller-manager-roles.yml