beta.kubernetes.io is deprecated, use kubernetes.io instead (#969)

* beta.kubernetes.io is deprecated, use kubernetes.io instead Warning: spec.template.spec.nodeSelector[beta.kubernetes.io/arch]: deprecated since v1.14; use "kubernetes.io/arch" instead Warning: spec.template.spec.nodeSelector[beta.kubernetes.io/os]: deprecated since v1.14; use "kubernetes.io/os" instead Signed-off-by: Tomoya Fujita <[email protected]>
openyurtio · Aug 30, 2022 · 991cce5 · 991cce5
1 parent 63b64c2
commit 991cce5
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/charts/openyurt/templates/yurt-tunnel-agent.yaml b/charts/openyurt/templates/yurt-tunnel-agent.yaml
@@ -14,7 +14,7 @@ spec:
         k8s-app: yurt-tunnel-agent
     spec:
       nodeSelector:
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
         openyurt.io/is-edge-worker: "true"
       containers:
       - command:

diff --git a/charts/openyurt/templates/yurt-tunnel-server.yaml b/charts/openyurt/templates/yurt-tunnel-server.yaml
@@ -189,8 +189,8 @@ spec:
       tolerations:
         - operator: "Exists"
       nodeSelector:
-        beta.kubernetes.io/arch: amd64
-        beta.kubernetes.io/os: linux
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
         openyurt.io/is-edge-worker: "false"
       containers:
         - name: yurt-tunnel-server

diff --git a/config/setup/yurt-tunnel-agent.yaml b/config/setup/yurt-tunnel-agent.yaml
@@ -15,7 +15,7 @@ spec:
         k8s-app: yurt-tunnel-agent
     spec:
       nodeSelector:
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
         openyurt.io/is-edge-worker: "true"
       containers:
       - command:

diff --git a/config/setup/yurt-tunnel-server.yaml b/config/setup/yurt-tunnel-server.yaml
@@ -190,8 +190,8 @@ spec:
       tolerations:
       - operator: "Exists"
       nodeSelector:
-        beta.kubernetes.io/arch: amd64
-        beta.kubernetes.io/os: linux
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
         openyurt.io/is-edge-worker: "false"
       containers:
       - name: yurt-tunnel-server

diff --git a/config/yaml-template/yurt-tunnel-agent.yaml b/config/yaml-template/yurt-tunnel-agent.yaml
@@ -15,7 +15,7 @@ spec:
         k8s-app: __project_prefix__-tunnel-agent
     spec:
       nodeSelector:
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
         __label_prefix__/is-edge-worker: "true"
       containers:
       - command:

diff --git a/config/yaml-template/yurt-tunnel-server.yaml b/config/yaml-template/yurt-tunnel-server.yaml
@@ -190,8 +190,8 @@ spec:
       tolerations:
       - operator: "Exists"
       nodeSelector:
-        beta.kubernetes.io/arch: amd64
-        beta.kubernetes.io/os: linux
+        kubernetes.io/arch: amd64
+        kubernetes.io/os: linux
         __label_prefix__/is-edge-worker: "false"
       containers:
       - name: __project_prefix__-tunnel-server

diff --git a/pkg/yurtctl/constants/yurt-app-manager-tmpl.go b/pkg/yurtctl/constants/yurt-app-manager-tmpl.go
@@ -680,7 +680,7 @@ spec:
           readOnly: true
       nodeSelector:
         openyurt.io/is-edge-worker: "false"
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
       priorityClassName: system-node-critical
       terminationGracePeriodSeconds: 10
       tolerations:

diff --git a/pkg/yurtctl/constants/yurt-tunnel-agent-tmpl.go b/pkg/yurtctl/constants/yurt-tunnel-agent-tmpl.go
@@ -35,7 +35,7 @@ spec:
         k8s-app: yurt-tunnel-agent
     spec:
       nodeSelector:
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
         {{.edgeWorkerLabel}}: "true"
       containers:
       - command:

diff --git a/pkg/yurtctl/constants/yurt-tunnel-server-tmpl.go b/pkg/yurtctl/constants/yurt-tunnel-server-tmpl.go
@@ -221,7 +221,7 @@ spec:
       tolerations:
       - operator: "Exists"
       nodeSelector:
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
         {{.edgeWorkerLabel}}: "false"
       containers:
       - name: yurt-tunnel-server