openstack/openstack-helm-infra
Code Issues Proposed changes

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

Browse Source 
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: I3056b642db0a1799089998e3c020b4203c9a93ab
This commit is contained in:
Samuel Liu 2023-03-20 13:38:07 +08:00
parent 6c5206a01c
commit 6034a00bf7
56 changed files with 85 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calico/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v3.4.0
description: OpenStack-Helm Calico
name: calico
version: 0.1.5
version: 0.1.6
home: https://github.com/projectcalico/calico
icon: https://camo.githubusercontent.com/64c8b5ed6ac97553ae367348e8a59a24e2ed5bdc/687474703a2f2f646f63732e70726f6a65637463616c69636f2e6f72672f696d616765732f66656c69782e706e67
sources:

4
calico/templates/daemonset-calico-etcd.yaml
View File

@ -57,9 +57,11 @@ spec:
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
# Allow this pod to run on the master.
# Allow this pod to run on the master/control-plane.
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
# Allow this pod to be rescheduled while the node is in "critical add-ons only" mode.
# This, along with the annotation above marks this pod as a critical add-on.
- key: CriticalAddonsOnly

2
calico/templates/deployment-calico-kube-controllers.yaml
View File

@ -105,6 +105,8 @@ spec:
operator: Exists
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
- key: node.kubernetes.io/not-ready
operator: Exists
effect: NoSchedule

2
calico/templates/job-calico-settings.yaml
View File

@ -42,7 +42,7 @@ spec:
{{ dict "envAll" $envAll "application" "calico_settings" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
hostNetwork: true
tolerations:
- key: node-role.kubernetes.io/master
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
- key: node.kubernetes.io/not-ready
operator: Exists

2
ceph-rgw/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Ceph RadosGW
name: ceph-rgw
version: 0.1.25
version: 0.1.26
home: https://github.com/ceph/ceph
...

3
ceph-rgw/values.yaml
View File

@ -236,6 +236,9 @@ pod:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
network_policy:
rgw:

2
elastic-filebeat/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v7.1.0
description: OpenStack-Helm Elastic Filebeat
name: elastic-filebeat
version: 0.1.4
version: 0.1.5
home: https://www.elastic.co/products/beats/filebeat
sources:
- https://github.com/elastic/beats/tree/master/filebeat

2
elastic-filebeat/values.yaml
View File

@ -269,6 +269,8 @@ pod:
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: node-role.kubernetes.io/node
operator: Exists
mounts:

2
elastic-metricbeat/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v7.1.0
description: OpenStack-Helm Elastic Metricbeat
name: elastic-metricbeat
version: 0.1.5
version: 0.1.6
home: https://www.elastic.co/products/beats/metricbeat
sources:
- https://github.com/elastic/beats/tree/master/metricbeat

2
elastic-metricbeat/values.yaml
View File

@ -267,6 +267,8 @@ pod:
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: node-role.kubernetes.io/node
operator: Exists
mounts:

2
falco/Chart.yaml
View File

@ -13,7 +13,7 @@
---
apiVersion: v1
name: falco
version: 0.1.7
version: 0.1.8
appVersion: 0.11.1
description: Sysdig Falco
keywords:

2
falco/values.yaml
View File

@ -76,6 +76,8 @@ pod:
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
conf:

2
flannel/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v0.8.0
description: OpenStack-Helm BootStrap Flannel
name: flannel
version: 0.1.4
version: 0.1.5
home: https://github.com/coreos/flannel
icon: https://raw.githubusercontent.com/coreos/flannel/master/logos/flannel-horizontal-color.png
sources:

3
flannel/templates/daemonset-kube-flannel-ds.yaml
View File

@ -89,6 +89,9 @@ spec:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
serviceAccountName: {{ $serviceAccountName }}
initContainers:
{{ tuple $envAll "flannel" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}

2
fluentbit/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v0.14.2
description: OpenStack-Helm Fluentbit
name: fluentbit
version: 0.1.4
version: 0.1.5
home: https://www.fluentbit.io/
sources:
- https://github.com/fluent/fluentbit

2
fluentbit/values.yaml
View File

@ -262,6 +262,8 @@ pod:
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: node-role.kubernetes.io/node
operator: Exists
mounts:

2
gnocchi/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v3.0.3
description: OpenStack-Helm Gnocchi
name: gnocchi
version: 0.1.6
version: 0.1.7
home: https://gnocchi.xyz/
icon: https://gnocchi.xyz/_static/gnocchi-logo.png
sources:

3
gnocchi/values.yaml
View File

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

2
ingress/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v0.42.0
description: OpenStack-Helm Ingress Controller
name: ingress
version: 0.2.13
version: 0.2.14
home: https://github.com/kubernetes/ingress
sources:
- https://github.com/kubernetes/ingress

3
ingress/values.yaml
View File

@ -88,6 +88,9 @@ pod:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
dns_policy: "ClusterFirstWithHostNet"
replicas:
ingress: 1

2
kube-dns/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.14.5
description: OpenStack-Helm Kube-DNS
name: kube-dns
version: 0.1.5
version: 0.1.6
home: https://github.com/coreos/flannel
icon: https://raw.githubusercontent.com/coreos/flannel/master/logos/flannel-horizontal-color.png
sources:

2
kube-dns/templates/deployment-kube-dns.yaml
View File

@ -188,6 +188,8 @@ spec:
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
volumes:
- name: pod-tmp
emptyDir: {}

2
kubernetes-node-problem-detector/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Kubernetes Node Problem Detector
name: kubernetes-node-problem-detector
version: 0.1.7
version: 0.1.8
home: https://github.com/kubernetes/node-problem-detector
sources:
- https://github.com/kubernetes/node-problem-detector

2
kubernetes-node-problem-detector/values.yaml
View File

@ -96,6 +96,8 @@ pod:
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: node-role.kubernetes.io/node
operator: Exists
dependencies:

2
libvirt/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm libvirt
name: libvirt
version: 0.1.17
version: 0.1.18
home: https://libvirt.org
sources:
- https://libvirt.org/git/?p=libvirt.git;a=summary

3
libvirt/values.yaml
View File

@ -169,6 +169,9 @@ pod:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
dns_policy: "ClusterFirstWithHostNet"
mounts:
libvirt:

2
mariadb/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v10.6.7
description: OpenStack-Helm MariaDB
name: mariadb
version: 0.2.29
version: 0.2.30
home: https://mariadb.com/kb/en/
icon: http://badges.mariadb.org/mariadb-badge-180x60.png
sources:

3
mariadb/values.yaml
View File

@ -155,6 +155,9 @@ pod:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
replicas:
server: 3
ingress: 2

2
memcached/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.5.5
description: OpenStack-Helm Memcached
name: memcached
version: 0.1.12
version: 0.1.13
home: https://github.com/memcached/memcached
...

3
memcached/values.yaml
View File

@ -169,6 +169,9 @@ pod:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
lifecycle:
upgrades:
deployments:

2
openvswitch/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm OpenVSwitch
name: openvswitch
version: 0.1.11
version: 0.1.12
home: http://openvswitch.org
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
sources:

3
openvswitch/values.yaml
View File

@ -44,6 +44,9 @@ pod:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
probes:
ovs:
ovs_db:

2
prometheus-node-exporter/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v0.18.1
description: OpenStack-Helm Node Exporter for Prometheus
name: prometheus-node-exporter
version: 0.1.5
version: 0.1.6
home: https://github.com/prometheus/node_exporter
sources:
- https://github.com/prometheus/node_exporter

2
prometheus-node-exporter/values.yaml
View File

@ -88,6 +88,8 @@ pod:
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: node-role.kubernetes.io/node
operator: Exists
dependencies:

2
prometheus-process-exporter/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v0.2.11
description: OpenStack-Helm Process Exporter for Prometheus
name: prometheus-process-exporter
version: 0.1.5
version: 0.1.6
home: https://github.com/openstack/openstack-helm-infra
sources:
- https://github.com/ncabatoff/process-exporter

2
prometheus-process-exporter/values.yaml
View File

@ -90,6 +90,8 @@ pod:
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
- key: node-role.kubernetes.io/control-plane
operator: Exists
- key: node-role.kubernetes.io/node
operator: Exists
dependencies:

2
rabbitmq/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v3.9.0
description: OpenStack-Helm RabbitMQ
name: rabbitmq
version: 0.1.26
version: 0.1.27
home: https://github.com/rabbitmq/rabbitmq-server
...

3
rabbitmq/values.yaml
View File

@ -125,6 +125,9 @@ pod:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
replicas:
server: 2
prometheus_rabbitmq_exporter: 1

1
releasenotes/notes/calico.yaml
View File

@ -6,4 +6,5 @@ calico:
- 0.1.3 Helm 3 - Fix Job labels
- 0.1.4 Update htk requirements
- 0.1.5 Added OCI registry authentication
- 0.1.6 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/ceph-rgw.yaml
View File

@ -26,4 +26,5 @@ ceph-rgw:
- 0.1.23 Added OCI registry authentication
- 0.1.24 Replace civetweb with beast for unencrypted connections
- 0.1.25 Update all Ceph images to Focal
- 0.1.26 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/elastic-filebeat.yaml
View File

@ -5,4 +5,5 @@ elastic-filebeat:
- 0.1.2 Use full image ref for docker official images
- 0.1.3 Update htk requirements
- 0.1.4 Added OCI registry authentication
- 0.1.5 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/elastic-metricbeat.yaml
View File

@ -6,4 +6,5 @@ elastic-metricbeat:
- 0.1.3 Use full image ref for docker official images
- 0.1.4 Update htk requirements
- 0.1.5 Added OCI registry authentication
- 0.1.6 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/falco.yaml
View File

@ -8,4 +8,5 @@ falco:
- 0.1.5 Use full image ref for docker official images
- 0.1.6 Update htk requirements
- 0.1.7 Added OCI registry authentication
- 0.1.8 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/flannel.yaml
View File

@ -5,4 +5,5 @@ flannel:
- 0.1.2 Use full image ref for docker official images
- 0.1.3 Update htk requirements
- 0.1.4 Added OCI registry authentication
- 0.1.5 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/fluentbit.yaml
View File

@ -5,4 +5,5 @@ fluentbit:
- 0.1.2 Use full image ref for docker official images
- 0.1.3 Update htk requirements
- 0.1.4 Added OCI registry authentication
- 0.1.5 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/gnocchi.yaml
View File

@ -7,4 +7,5 @@ gnocchi:
- 0.1.4 Update htk requirements
- 0.1.5 Enable taint toleration for Openstack services jobs
- 0.1.6 Update all Ceph images to Focal
- 0.1.7 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/ingress.yaml
View File

@ -17,4 +17,5 @@ ingress:
- 0.2.11 Fix resource name in the role
- 0.2.12 Uplift ingress to 1.5.1
- 0.2.13 Allow setting node_port for the svc
- 0.2.14 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/kube-dns.yaml
View File

@ -6,4 +6,5 @@ kube-dns:
- 0.1.3 Use full image ref for docker official images
- 0.1.4 Update htk requirements
- 0.1.5 Added OCI registry authentication
- 0.1.6 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/kubernetes-node-problem-detector.yaml
View File

@ -8,4 +8,5 @@ kubernetes-node-problem-detector:
- 0.1.5 Use full image ref for docker official images
- 0.1.6 Update htk requirements
- 0.1.7 Added OCI registry authentication
- 0.1.8 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/libvirt.yaml
View File

@ -18,4 +18,5 @@ libvirt:
- 0.1.15 Add support for libvirt to connect to external ceph without any local ceph present
- 0.1.16 Update all Ceph images to Focal
- 0.1.17 Add ovn.yaml values_override, remove dependency from neutron-ovs-agent module
- 0.1.18 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/mariadb.yaml
View File

@ -45,4 +45,5 @@ mariadb:
- 0.2.27 Fix broken helmrelease for helmv3
- 0.2.28 Added verify_databases_backup_in_directory function implementation
- 0.2.29 Uplift Mariadb-ingress to 1.5.1
- 0.2.30 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/memcached.yaml
View File

@ -13,4 +13,5 @@ memcached:
- 0.1.10 Updated naming for subchart compatibility
- 0.1.11 Remove gnocchi netpol override
- 0.1.12 Added OCI registry authentication
- 0.1.13 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/openvswitch.yaml
View File

@ -12,5 +12,6 @@ openvswitch:
- 0.1.9 Enable ovs hardware offload
- 0.1.10 Merge ovs-db and ovs-vswitchd in one Daemonset
- 0.1.11 Add ovn.yaml in values_override, Enable ptcp_port 6640 which needed when use ovn
- 0.1.12 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/prometheus-node-exporter.yaml
View File

@ -6,4 +6,5 @@ prometheus-node-exporter:
- 0.1.3 Use full image ref for docker official images
- 0.1.4 Update htk requirements
- 0.1.5 Added OCI registry authentication
- 0.1.6 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/prometheus-process-exporter.yaml
View File

@ -6,4 +6,5 @@ prometheus-process-exporter:
- 0.1.3 Use full image ref for docker official images
- 0.1.4 Update htk requirements
- 0.1.5 Added OCI registry authentication
- 0.1.6 Replace node-role.kubernetes.io/master with control-plane
...

1
releasenotes/notes/rabbitmq.yaml
View File

@ -26,4 +26,5 @@ rabbitmq:
- 0.1.24 Added OCI registry authentication
- 0.1.25 Add hostPort support
- 0.1.26 Moved guest admin removal to init template
- 0.1.27 Replace node-role.kubernetes.io/master with control-plane
...