From 73e696b3fbbbbcfb3b6acb1b191885f98ff2b18d Mon Sep 17 00:00:00 2001 From: Samuel Liu Date: Mon, 20 Mar 2023 13:51:59 +0800 Subject: [PATCH] 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 --- aodh/Chart.yaml | 2 +- aodh/values.yaml | 3 +++ barbican/Chart.yaml | 2 +- barbican/values.yaml | 3 +++ ceilometer/Chart.yaml | 2 +- ceilometer/values.yaml | 3 +++ cinder/Chart.yaml | 2 +- cinder/values.yaml | 3 +++ glance/Chart.yaml | 2 +- glance/values.yaml | 3 +++ heat/Chart.yaml | 2 +- heat/values.yaml | 3 +++ horizon/Chart.yaml | 2 +- horizon/values.yaml | 3 +++ ironic/Chart.yaml | 2 +- ironic/values.yaml | 3 +++ keystone/Chart.yaml | 2 +- keystone/values.yaml | 3 +++ neutron/Chart.yaml | 2 +- neutron/values.yaml | 3 +++ nova/Chart.yaml | 2 +- nova/values.yaml | 3 +++ placement/Chart.yaml | 2 +- placement/values.yaml | 3 +++ releasenotes/notes/aodh.yaml | 1 + releasenotes/notes/barbican.yaml | 1 + releasenotes/notes/ceilometer.yaml | 1 + releasenotes/notes/cinder.yaml | 1 + releasenotes/notes/glance.yaml | 1 + releasenotes/notes/heat.yaml | 1 + releasenotes/notes/horizon.yaml | 1 + releasenotes/notes/ironic.yaml | 1 + releasenotes/notes/keystone.yaml | 1 + releasenotes/notes/neutron.yaml | 1 + releasenotes/notes/nova.yaml | 1 + releasenotes/notes/placement.yaml | 1 + 36 files changed, 60 insertions(+), 12 deletions(-) diff --git a/aodh/Chart.yaml b/aodh/Chart.yaml index 2d7d5f8525..56642a8561 100644 --- a/aodh/Chart.yaml +++ b/aodh/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v1 appVersion: v1.0.0 description: Openstack-Helm Aodh name: aodh -version: 0.2.6 +version: 0.2.7 home: https://docs.openstack.org/aodh/latest/ sources: - https://opendev.org/openstack/aodh diff --git a/aodh/values.yaml b/aodh/values.yaml index f8d5eabaed..4727e716d8 100644 --- a/aodh/values.yaml +++ b/aodh/values.yaml @@ -105,6 +105,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule mounts: aodh_api: init_container: null diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml index b33046bec8..23e6fc756e 100644 --- a/barbican/Chart.yaml +++ b/barbican/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Barbican name: barbican -version: 0.3.0 +version: 0.3.1 home: https://docs.openstack.org/barbican/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png sources: diff --git a/barbican/values.yaml b/barbican/values.yaml index 5c598ede45..9c44fd0a6e 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -85,6 +85,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule mounts: barbican_api: init_container: null diff --git a/ceilometer/Chart.yaml b/ceilometer/Chart.yaml index 845dad68f7..91f4c4a5fa 100644 --- a/ceilometer/Chart.yaml +++ b/ceilometer/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceilometer name: ceilometer -version: 0.2.7 +version: 0.2.8 home: https://docs.openstack.org/ceilometer/latest/ sources: - https://opendev.org/openstack/ceilometer diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 1106192477..23df30e238 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -1933,6 +1933,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule mounts: ceilometer_tests: init_container: null diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml index 4fc5460332..401217fc23 100644 --- a/cinder/Chart.yaml +++ b/cinder/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Cinder name: cinder -version: 0.3.8 +version: 0.3.9 home: https://docs.openstack.org/cinder/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png sources: diff --git a/cinder/values.yaml b/cinder/values.yaml index 8096f97b78..93c302da9f 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -183,6 +183,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule useHostNetwork: volume: false backup: false diff --git a/glance/Chart.yaml b/glance/Chart.yaml index dd7912c23b..8ce62b3a54 100644 --- a/glance/Chart.yaml +++ b/glance/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Glance name: glance -version: 0.4.3 +version: 0.4.4 home: https://docs.openstack.org/glance/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png sources: diff --git a/glance/values.yaml b/glance/values.yaml index 69f703e11e..249f2b63aa 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -840,6 +840,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule useHostNetwork: api: false mounts: diff --git a/heat/Chart.yaml b/heat/Chart.yaml index 05cd5adc25..1e0f81da34 100644 --- a/heat/Chart.yaml +++ b/heat/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Heat name: heat -version: 0.3.1 +version: 0.3.2 home: https://docs.openstack.org/heat/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png sources: diff --git a/heat/values.yaml b/heat/values.yaml index 555af53a33..a476c6a134 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -1025,6 +1025,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule mounts: heat_api: init_container: null diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml index 9da348ecd3..9f89632dc7 100644 --- a/horizon/Chart.yaml +++ b/horizon/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Horizon name: horizon -version: 0.3.4 +version: 0.3.5 home: https://docs.openstack.org/horizon/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png sources: diff --git a/horizon/values.yaml b/horizon/values.yaml index 3abf9a139c..7d05ef78f0 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -1138,6 +1138,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule mounts: horizon_db_init: init_container: null diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml index da269916b3..ca827064fb 100644 --- a/ironic/Chart.yaml +++ b/ironic/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ironic name: ironic -version: 0.2.8 +version: 0.2.9 home: https://docs.openstack.org/ironic/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png sources: diff --git a/ironic/values.yaml b/ironic/values.yaml index 5c908d4553..89fe1aecd0 100644 --- a/ironic/values.yaml +++ b/ironic/values.yaml @@ -576,6 +576,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule mounts: ironic_api: init_container: null diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml index aff5bbb33b..3da9e227f6 100644 --- a/keystone/Chart.yaml +++ b/keystone/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Keystone name: keystone -version: 0.3.0 +version: 0.3.1 home: https://docs.openstack.org/keystone/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png sources: diff --git a/keystone/values.yaml b/keystone/values.yaml index 69546b56b8..2b5caaf700 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -223,6 +223,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule mounts: keystone_db_init: init_container: null diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml index 6a2e6c6f09..fdf1974d25 100644 --- a/neutron/Chart.yaml +++ b/neutron/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Neutron name: neutron -version: 0.3.3 +version: 0.3.4 home: https://docs.openstack.org/neutron/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png sources: diff --git a/neutron/values.yaml b/neutron/values.yaml index d3b314e8e1..709ea7c76b 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -597,6 +597,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule mounts: neutron_server: init_container: null diff --git a/nova/Chart.yaml b/nova/Chart.yaml index 7556276031..acc0486b0a 100644 --- a/nova/Chart.yaml +++ b/nova/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Nova name: nova -version: 0.3.4 +version: 0.3.5 home: https://docs.openstack.org/nova/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png sources: diff --git a/nova/values.yaml b/nova/values.yaml index 1a0da3e5f7..d1a52caa07 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -2164,6 +2164,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule mounts: nova_compute: init_container: null diff --git a/placement/Chart.yaml b/placement/Chart.yaml index 312ed00d9a..449abe85d1 100644 --- a/placement/Chart.yaml +++ b/placement/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Placement name: placement -version: 0.3.2 +version: 0.3.3 home: https://docs.openstack.org/placement/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png sources: diff --git a/placement/values.yaml b/placement/values.yaml index ff33660c6c..7e3e9ce356 100644 --- a/placement/values.yaml +++ b/placement/values.yaml @@ -319,6 +319,9 @@ pod: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule mounts: placement: init_container: null diff --git a/releasenotes/notes/aodh.yaml b/releasenotes/notes/aodh.yaml index 3ac5191008..13fc07853d 100644 --- a/releasenotes/notes/aodh.yaml +++ b/releasenotes/notes/aodh.yaml @@ -9,4 +9,5 @@ aodh: - 0.2.4 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1 - 0.2.5 Added OCI registry authentication - 0.2.6 Remove default policy rules + - 0.2.7 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml index 12043249d3..f395d1404c 100644 --- a/releasenotes/notes/barbican.yaml +++ b/releasenotes/notes/barbican.yaml @@ -24,4 +24,5 @@ barbican: - 0.2.18 Support TLS for ks jobs - 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.1 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/ceilometer.yaml b/releasenotes/notes/ceilometer.yaml index 8c0d112ecd..7aeef93a9d 100644 --- a/releasenotes/notes/ceilometer.yaml +++ b/releasenotes/notes/ceilometer.yaml @@ -10,4 +10,5 @@ ceilometer: - 0.2.5 Migrated PodDisruptionBudget resource to policy/v1 API version - 0.2.6 Added OCI registry authentication - 0.2.7 Remove default policy rules + - 0.2.8 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml index 059908e7a0..619fd4c22a 100644 --- a/releasenotes/notes/cinder.yaml +++ b/releasenotes/notes/cinder.yaml @@ -58,4 +58,5 @@ cinder: - 0.3.6 Fix ceph keyring placement for uppercased backends - 0.3.7 Allow Ceph pools to use 1x replication - 0.3.8 Update all Ceph images to Focal + - 0.3.9 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml index 20cf162078..cd4c164246 100644 --- a/releasenotes/notes/glance.yaml +++ b/releasenotes/notes/glance.yaml @@ -37,4 +37,5 @@ glance: - 0.4.1 Remove default policy rules - 0.4.2 Allow Ceph pools to use 1x replication - 0.4.3 Update all Ceph images to Focal + - 0.4.4 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/heat.yaml b/releasenotes/notes/heat.yaml index 540b2b3d04..3f1fa2cd3d 100644 --- a/releasenotes/notes/heat.yaml +++ b/releasenotes/notes/heat.yaml @@ -27,4 +27,5 @@ heat: - 0.2.18 Change hook weight for bootstrap job - 0.3.0 Remove support for Train and Ussuri - 0.3.1 Remove default policy rules + - 0.3.2 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/horizon.yaml b/releasenotes/notes/horizon.yaml index d9eea937eb..0632c38754 100644 --- a/releasenotes/notes/horizon.yaml +++ b/releasenotes/notes/horizon.yaml @@ -41,4 +41,5 @@ horizon: - 0.3.2 Update mysql client version to 1.4.0 - 0.3.3 Update mysql client version in django.wsgi also - 0.3.4 Add readiness probe timeout + - 0.3.5 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/ironic.yaml b/releasenotes/notes/ironic.yaml index e0c8112ae7..6543e0afc2 100644 --- a/releasenotes/notes/ironic.yaml +++ b/releasenotes/notes/ironic.yaml @@ -12,4 +12,5 @@ ironic: - 0.2.6 Added OCI registry authentication - 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.9 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml index 82d21f33f7..1da6faa8c3 100644 --- a/releasenotes/notes/keystone.yaml +++ b/releasenotes/notes/keystone.yaml @@ -47,4 +47,5 @@ keystone: - 0.2.29 Support TLS endpoints - 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.1 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml index 34bfe91bc3..ff75809111 100644 --- a/releasenotes/notes/neutron.yaml +++ b/releasenotes/notes/neutron.yaml @@ -45,4 +45,5 @@ neutron: - 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.3 Add OVN Support + - 0.3.4 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml index d932dac80c..1f87a5f382 100644 --- a/releasenotes/notes/nova.yaml +++ b/releasenotes/notes/nova.yaml @@ -73,4 +73,5 @@ nova: - 0.3.2 Remove un-used configs for Nova - 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.5 Replace node-role.kubernetes.io/master with control-plane ... diff --git a/releasenotes/notes/placement.yaml b/releasenotes/notes/placement.yaml index 8c604c27e2..da61caaca0 100644 --- a/releasenotes/notes/placement.yaml +++ b/releasenotes/notes/placement.yaml @@ -25,4 +25,5 @@ placement: - 0.3.0 Remove placement-migrate - 0.3.1 Remove support for Train and Ussuri - 0.3.2 Remove default policy rules + - 0.3.3 Replace node-role.kubernetes.io/master with control-plane ...