Replace node-role.kubernetes.io/master with control-plane

The master label is no longer present on kubeadm control plane nodes(v1.24). For new clusters, the label 'node-role.kubernetes.io/master' will no longer be added to control plane nodes, only the label 'node-role.kubernetes.io/control-plane' will be added. For more information, refer to KEP-2067[https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/kubeadm/2067-rename-master-label-taint]: Rename the kubeadm "master" label and taint.

the kubernetes pr: https://github.com/kubernetes/kubernetes/pull/107533

Change-Id: Iad8c833371efb3ec35149c89eb8fafdf1150fa87
This commit is contained in:
Samuel Liu 2023-03-20 13:51:59 +08:00
parent c83582a866
commit 73e696b3fb
36 changed files with 60 additions and 12 deletions

View File

@ -16,7 +16,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: Openstack-Helm Aodh description: Openstack-Helm Aodh
name: aodh name: aodh
version: 0.2.6 version: 0.2.7
home: https://docs.openstack.org/aodh/latest/ home: https://docs.openstack.org/aodh/latest/
sources: sources:
- https://opendev.org/openstack/aodh - https://opendev.org/openstack/aodh

View File

@ -105,6 +105,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
mounts: mounts:
aodh_api: aodh_api:
init_container: null init_container: null

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Barbican description: OpenStack-Helm Barbican
name: barbican name: barbican
version: 0.3.0 version: 0.3.1
home: https://docs.openstack.org/barbican/latest/ home: https://docs.openstack.org/barbican/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
sources: sources:

View File

@ -85,6 +85,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
mounts: mounts:
barbican_api: barbican_api:
init_container: null init_container: null

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceilometer description: OpenStack-Helm Ceilometer
name: ceilometer name: ceilometer
version: 0.2.7 version: 0.2.8
home: https://docs.openstack.org/ceilometer/latest/ home: https://docs.openstack.org/ceilometer/latest/
sources: sources:
- https://opendev.org/openstack/ceilometer - https://opendev.org/openstack/ceilometer

View File

@ -1933,6 +1933,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
mounts: mounts:
ceilometer_tests: ceilometer_tests:
init_container: null init_container: null

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Cinder description: OpenStack-Helm Cinder
name: cinder name: cinder
version: 0.3.8 version: 0.3.9
home: https://docs.openstack.org/cinder/latest/ home: https://docs.openstack.org/cinder/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
sources: sources:

View File

@ -183,6 +183,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
useHostNetwork: useHostNetwork:
volume: false volume: false
backup: false backup: false

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Glance description: OpenStack-Helm Glance
name: glance name: glance
version: 0.4.3 version: 0.4.4
home: https://docs.openstack.org/glance/latest/ home: https://docs.openstack.org/glance/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
sources: sources:

View File

@ -840,6 +840,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
useHostNetwork: useHostNetwork:
api: false api: false
mounts: mounts:

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Heat description: OpenStack-Helm Heat
name: heat name: heat
version: 0.3.1 version: 0.3.2
home: https://docs.openstack.org/heat/latest/ home: https://docs.openstack.org/heat/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png
sources: sources:

View File

@ -1025,6 +1025,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
mounts: mounts:
heat_api: heat_api:
init_container: null init_container: null

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Horizon description: OpenStack-Helm Horizon
name: horizon name: horizon
version: 0.3.4 version: 0.3.5
home: https://docs.openstack.org/horizon/latest/ home: https://docs.openstack.org/horizon/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
sources: sources:

View File

@ -1138,6 +1138,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
mounts: mounts:
horizon_db_init: horizon_db_init:
init_container: null init_container: null

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ironic description: OpenStack-Helm Ironic
name: ironic name: ironic
version: 0.2.8 version: 0.2.9
home: https://docs.openstack.org/ironic/latest/ home: https://docs.openstack.org/ironic/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png
sources: sources:

View File

@ -576,6 +576,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
mounts: mounts:
ironic_api: ironic_api:
init_container: null init_container: null

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Keystone description: OpenStack-Helm Keystone
name: keystone name: keystone
version: 0.3.0 version: 0.3.1
home: https://docs.openstack.org/keystone/latest/ home: https://docs.openstack.org/keystone/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
sources: sources:

View File

@ -223,6 +223,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
mounts: mounts:
keystone_db_init: keystone_db_init:
init_container: null init_container: null

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Neutron description: OpenStack-Helm Neutron
name: neutron name: neutron
version: 0.3.3 version: 0.3.4
home: https://docs.openstack.org/neutron/latest/ home: https://docs.openstack.org/neutron/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
sources: sources:

View File

@ -597,6 +597,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
mounts: mounts:
neutron_server: neutron_server:
init_container: null init_container: null

View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Nova description: OpenStack-Helm Nova
name: nova name: nova
version: 0.3.4 version: 0.3.5
home: https://docs.openstack.org/nova/latest/ home: https://docs.openstack.org/nova/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
sources: sources:

View File

@ -2164,6 +2164,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
mounts: mounts:
nova_compute: nova_compute:
init_container: null init_container: null

View File

@ -16,7 +16,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Placement description: OpenStack-Helm Placement
name: placement name: placement
version: 0.3.2 version: 0.3.3
home: https://docs.openstack.org/placement/latest/ home: https://docs.openstack.org/placement/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png
sources: sources:

View File

@ -319,6 +319,9 @@ pod:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
mounts: mounts:
placement: placement:
init_container: null init_container: null

View File

@ -9,4 +9,5 @@ aodh:
- 0.2.4 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1 - 0.2.4 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
- 0.2.5 Added OCI registry authentication - 0.2.5 Added OCI registry authentication
- 0.2.6 Remove default policy rules - 0.2.6 Remove default policy rules
- 0.2.7 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -24,4 +24,5 @@ barbican:
- 0.2.18 Support TLS for ks jobs - 0.2.18 Support TLS for ks jobs
- 0.2.19 Support SSL offloading at reverse proxy for internal and admin endpoints - 0.2.19 Support SSL offloading at reverse proxy for internal and admin endpoints
- 0.3.0 Remove support for Train and Ussuri - 0.3.0 Remove support for Train and Ussuri
- 0.3.1 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -10,4 +10,5 @@ ceilometer:
- 0.2.5 Migrated PodDisruptionBudget resource to policy/v1 API version - 0.2.5 Migrated PodDisruptionBudget resource to policy/v1 API version
- 0.2.6 Added OCI registry authentication - 0.2.6 Added OCI registry authentication
- 0.2.7 Remove default policy rules - 0.2.7 Remove default policy rules
- 0.2.8 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -58,4 +58,5 @@ cinder:
- 0.3.6 Fix ceph keyring placement for uppercased backends - 0.3.6 Fix ceph keyring placement for uppercased backends
- 0.3.7 Allow Ceph pools to use 1x replication - 0.3.7 Allow Ceph pools to use 1x replication
- 0.3.8 Update all Ceph images to Focal - 0.3.8 Update all Ceph images to Focal
- 0.3.9 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -37,4 +37,5 @@ glance:
- 0.4.1 Remove default policy rules - 0.4.1 Remove default policy rules
- 0.4.2 Allow Ceph pools to use 1x replication - 0.4.2 Allow Ceph pools to use 1x replication
- 0.4.3 Update all Ceph images to Focal - 0.4.3 Update all Ceph images to Focal
- 0.4.4 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -27,4 +27,5 @@ heat:
- 0.2.18 Change hook weight for bootstrap job - 0.2.18 Change hook weight for bootstrap job
- 0.3.0 Remove support for Train and Ussuri - 0.3.0 Remove support for Train and Ussuri
- 0.3.1 Remove default policy rules - 0.3.1 Remove default policy rules
- 0.3.2 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -41,4 +41,5 @@ horizon:
- 0.3.2 Update mysql client version to 1.4.0 - 0.3.2 Update mysql client version to 1.4.0
- 0.3.3 Update mysql client version in django.wsgi also - 0.3.3 Update mysql client version in django.wsgi also
- 0.3.4 Add readiness probe timeout - 0.3.4 Add readiness probe timeout
- 0.3.5 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -12,4 +12,5 @@ ironic:
- 0.2.6 Added OCI registry authentication - 0.2.6 Added OCI registry authentication
- 0.2.7 Use HTTP probe instead of TCP probe - 0.2.7 Use HTTP probe instead of TCP probe
- 0.2.8 Add helm3 hook supports to allow things like terraform deploys - 0.2.8 Add helm3 hook supports to allow things like terraform deploys
- 0.2.9 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -47,4 +47,5 @@ keystone:
- 0.2.29 Support TLS endpoints - 0.2.29 Support TLS endpoints
- 0.2.30 Distinguish between port number of internal endpoint and binding port number - 0.2.30 Distinguish between port number of internal endpoint and binding port number
- 0.3.0 Remove support for Train and Ussuri - 0.3.0 Remove support for Train and Ussuri
- 0.3.1 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -45,4 +45,5 @@ neutron:
- 0.3.1 Remove default policy rules - 0.3.1 Remove default policy rules
- 0.3.2 Use correct labels for ovs which uses one daemonset for ovs-db and ovs-vswitchd - 0.3.2 Use correct labels for ovs which uses one daemonset for ovs-db and ovs-vswitchd
- 0.3.3 Add OVN Support - 0.3.3 Add OVN Support
- 0.3.4 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -73,4 +73,5 @@ nova:
- 0.3.2 Remove un-used configs for Nova - 0.3.2 Remove un-used configs for Nova
- 0.3.3 Update all Ceph images to Focal - 0.3.3 Update all Ceph images to Focal
- 0.3.4 Add OVN values_override, disable dependency to ovn-agent and vif configs for ovn - 0.3.4 Add OVN values_override, disable dependency to ovn-agent and vif configs for ovn
- 0.3.5 Replace node-role.kubernetes.io/master with control-plane
... ...

View File

@ -25,4 +25,5 @@ placement:
- 0.3.0 Remove placement-migrate - 0.3.0 Remove placement-migrate
- 0.3.1 Remove support for Train and Ussuri - 0.3.1 Remove support for Train and Ussuri
- 0.3.2 Remove default policy rules - 0.3.2 Remove default policy rules
- 0.3.3 Replace node-role.kubernetes.io/master with control-plane
... ...