From c1d93422298255d3a2660d098621b3d75121f8b4 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Fri, 24 Feb 2023 10:20:42 +0800 Subject: [PATCH] stoping using beta.kubernetes.io/os --- bindata/manifests/daemon/daemonset.yaml | 2 +- bindata/manifests/operator-webhook/server.yaml | 2 +- bindata/manifests/plugins/sriov-device-plugin.yaml | 2 +- bindata/manifests/webhook/server.yaml | 2 +- controllers/sriovnetworknodepolicy_controller.go | 2 +- doc/quickstart.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bindata/manifests/daemon/daemonset.yaml b/bindata/manifests/daemon/daemonset.yaml index 0c47760de..ac9cda2c6 100644 --- a/bindata/manifests/daemon/daemonset.yaml +++ b/bindata/manifests/daemon/daemonset.yaml @@ -25,7 +25,7 @@ spec: hostNetwork: true hostPID: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux node-role.kubernetes.io/worker: tolerations: - operator: Exists diff --git a/bindata/manifests/operator-webhook/server.yaml b/bindata/manifests/operator-webhook/server.yaml index be9d400c5..9efe35c99 100644 --- a/bindata/manifests/operator-webhook/server.yaml +++ b/bindata/manifests/operator-webhook/server.yaml @@ -26,7 +26,7 @@ spec: serviceAccountName: operator-webhook-sa priorityClassName: "system-cluster-critical" nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux affinity: {{ if not .ExternalControlPlane }} nodeAffinity: diff --git a/bindata/manifests/plugins/sriov-device-plugin.yaml b/bindata/manifests/plugins/sriov-device-plugin.yaml index 8330836c1..b36ae55cb 100644 --- a/bindata/manifests/plugins/sriov-device-plugin.yaml +++ b/bindata/manifests/plugins/sriov-device-plugin.yaml @@ -26,7 +26,7 @@ spec: spec: hostNetwork: true nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux node-role.kubernetes.io/worker: tolerations: - operator: Exists diff --git a/bindata/manifests/webhook/server.yaml b/bindata/manifests/webhook/server.yaml index 69d011380..0c4f35a37 100644 --- a/bindata/manifests/webhook/server.yaml +++ b/bindata/manifests/webhook/server.yaml @@ -29,7 +29,7 @@ spec: serviceAccountName: network-resources-injector-sa priorityClassName: "system-cluster-critical" nodeSelector: - beta.kubernetes.io/os: linux + kubernetes.io/os: linux affinity: {{ if not .ExternalControlPlane }} nodeAffinity: diff --git a/controllers/sriovnetworknodepolicy_controller.go b/controllers/sriovnetworknodepolicy_controller.go index c5c227e52..cd4f7ff7b 100644 --- a/controllers/sriovnetworknodepolicy_controller.go +++ b/controllers/sriovnetworknodepolicy_controller.go @@ -113,7 +113,7 @@ func (r *SriovNetworkNodePolicyReconciler) Reconcile(ctx context.Context, req ct nodeList := &corev1.NodeList{} lo := &client.MatchingLabels{ "node-role.kubernetes.io/worker": "", - "beta.kubernetes.io/os": "linux", + "kubernetes.io/os": "linux", } defaultOpConf := &sriovnetworkv1.SriovOperatorConfig{} if err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: constants.DefaultConfigName}, defaultOpConf); err != nil { diff --git a/doc/quickstart.md b/doc/quickstart.md index c615c1348..a3c5d3ead 100644 --- a/doc/quickstart.md +++ b/doc/quickstart.md @@ -104,7 +104,7 @@ NAME TYPE CLUSTER-IP EXTERNAL-IP PORT( service/sriov-network-operator ClusterIP 10.102.53.223 8383/TCP 9s NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE -daemonset.apps/sriov-network-config-daemon 1 1 1 1 1 beta.kubernetes.io/os=linux,node-role.kubernetes.io/worker= 8s +daemonset.apps/sriov-network-config-daemon 1 1 1 1 1 kubernetes.io/os=linux,node-role.kubernetes.io/worker= 8s NAME READY UP-TO-DATE AVAILABLE AGE deployment.apps/sriov-network-operator 1/1 1 1 10s