github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Replace Beta OS/arch labels with the GA ones

Browse Source 
Beta OS/arch labels have been deprecated since 1.14.
This change replaces these labels with the GA ones.
This commit is contained in:
Yu-Ju Hong 2020-02-12 11:30:39 -08:00
parent a70e574955
commit bcd975aa65
19 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/dashboard/dashboard-deployment.yaml
View File

@ -63,7 +63,7 @@ spec:
emptyDir: {}
serviceAccountName: kubernetes-dashboard
nodeSelector:
"beta.kubernetes.io/os": linux
"kubernetes.io/os": linux
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"

2
cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
View File

@ -106,5 +106,5 @@ spec:
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
serviceAccountName: kube-dns-autoscaler

2
cluster/addons/dns/coredns/coredns.yaml.base
View File

@ -115,7 +115,7 @@ spec:
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.6.5

2
cluster/addons/dns/coredns/coredns.yaml.in
View File

@ -115,7 +115,7 @@ spec:
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.6.5

2
cluster/addons/dns/coredns/coredns.yaml.sed
View File

@ -115,7 +115,7 @@ spec:
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.6.5

2
cluster/addons/dns/kube-dns/kube-dns.yaml.base
View File

@ -94,7 +94,7 @@ spec:
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
volumes:
- name: kube-dns-config
configMap:

2
cluster/addons/dns/kube-dns/kube-dns.yaml.in
View File

@ -94,7 +94,7 @@ spec:
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
volumes:
- name: kube-dns-config
configMap:

2
cluster/addons/dns/kube-dns/kube-dns.yaml.sed
View File

@ -94,7 +94,7 @@ spec:
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
volumes:
- name: kube-dns-config
configMap:

2
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View File

@ -98,7 +98,7 @@ spec:
fieldPath: metadata.namespace
# END_PROMETHEUS_TO_SD
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
terminationGracePeriodSeconds: 60
tolerations:
- operator: "Exists"

2
cluster/addons/kube-proxy/kube-proxy-ds.yaml
View File

@ -25,7 +25,7 @@ spec:
priorityClassName: system-node-critical
hostNetwork: true
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
node.kubernetes.io/kube-proxy-ds-ready: "true"
tolerations:
- operator: "Exists"

2
cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
View File

@ -84,5 +84,5 @@ spec:
# END_PROMETHEUS_TO_SD
nodeSelector:
cloud.google.com/metadata-proxy-ready: "true"
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
terminationGracePeriodSeconds: 30

16
cluster/gce/windows/smoke-test.sh
View File

@ -45,13 +45,13 @@ output_file=/tmp/k8s-smoke-test.out
function check_windows_nodes_are_ready {
# kubectl filtering is the worst.
statuses=$(${kubectl} get nodes -l beta.kubernetes.io/os=windows \
statuses=$(${kubectl} get nodes -l kubernetes.io/os=windows \
-o jsonpath='{.items[*].status.conditions[?(@.type=="Ready")].status}')
for status in $statuses; do
if [[ $status == "False" ]]; then
echo "ERROR: some Windows node has status != Ready"
echo "kubectl get nodes -l beta.kubernetes.io/os=windows"
${kubectl} get nodes -l beta.kubernetes.io/os=windows
echo "kubectl get nodes -l kubernetes.io/os=windows"
${kubectl} get nodes -l kubernetes.io/os=windows
exit 1
fi
done
@ -61,7 +61,7 @@ function check_windows_nodes_are_ready {
function untaint_windows_nodes {
# Untaint the windows nodes to allow test workloads without tolerations to be
# scheduled onto them.
WINDOWS_NODES=$(${kubectl} get nodes -l beta.kubernetes.io/os=windows -o name)
WINDOWS_NODES=$(${kubectl} get nodes -l kubernetes.io/os=windows -o name)
for node in $WINDOWS_NODES; do
${kubectl} taint node "$node" node.kubernetes.io/os:NoSchedule-
done
@ -106,7 +106,7 @@ spec:
- name: nginx
image: nginx:1.7.9
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
EOF
if ! ${kubectl} create -f $linux_webserver_deployment.yaml; then
@ -183,7 +183,7 @@ spec:
image: ubuntu
command: ["sleep", "123456"]
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
EOF
if ! ${kubectl} create -f $linux_command_deployment.yaml; then
@ -280,7 +280,7 @@ spec:
args:
- serve-hostname
nodeSelector:
beta.kubernetes.io/os: windows
kubernetes.io/os: windows
tolerations:
- effect: NoSchedule
key: node.kubernetes.io/os
@ -360,7 +360,7 @@ spec:
- name: pause-win
image: gcr.io/gke-release/pause-win:1.1.0
nodeSelector:
beta.kubernetes.io/os: windows
kubernetes.io/os: windows
tolerations:
- effect: NoSchedule
key: node.kubernetes.io/os

2
cmd/kubeadm/app/phases/addons/dns/manifests.go
View File

@ -241,7 +241,7 @@ spec:
- key: {{ .ControlPlaneTaintKey }}
effect: NoSchedule
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
containers:
- name: coredns
image: {{ .Image }}

2
cmd/kubeadm/app/phases/addons/proxy/manifests.go
View File

@ -113,6 +113,6 @@ spec:
operator: Exists
- operator: Exists
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
`
)

4
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/node.yaml
View File

@ -7,10 +7,10 @@ metadata:
volumes.kubernetes.io/controller-managed-attach-detach: "true"
creationTimestamp: "2019-07-09T16:17:29Z"
labels:
beta.kubernetes.io/arch: amd64
kubernetes.io/arch: amd64
beta.kubernetes.io/fluentd-ds-ready: "true"
beta.kubernetes.io/instance-type: n1-standard-4
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
cloud.google.com/gke-nodepool: default-pool
cloud.google.com/gke-os-distribution: cos
failure-domain.beta.kubernetes.io/region: us-central1

4
test/e2e/storage/drivers/in_tree.go
View File

@ -1319,7 +1319,7 @@ func (g *gcePdDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestCo
if framework.NodeOSDistroIs("windows") {
config.ClientNodeSelection = e2epod.NodeSelection{
Selector: map[string]string{
"beta.kubernetes.io/os": "windows",
"kubernetes.io/os": "windows",
},
}
}
@ -1716,7 +1716,7 @@ func (a *awsDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestConf
if framework.NodeOSDistroIs("windows") {
config.ClientNodeSelection = e2epod.NodeSelection{
Selector: map[string]string{
"beta.kubernetes.io/os": "windows",
"kubernetes.io/os": "windows",
},
}
}

2
test/e2e/windows/density.go
View File

@ -236,7 +236,7 @@ func newDensityTestPods(numPods int, volume bool, imageName, podType string) []*
},
},
NodeSelector: map[string]string{
"beta.kubernetes.io/os": "windows",
"kubernetes.io/os": "windows",
},
},
}

2
test/e2e/windows/hybrid_network.go
View File

@ -117,7 +117,7 @@ func createTestPod(f *framework.Framework, image string, os string) *v1.Pod {
},
},
NodeSelector: map[string]string{
"beta.kubernetes.io/os": os,
"kubernetes.io/os": os,
},
},
}

6
test/e2e/windows/memory_limits.go
View File

@ -168,7 +168,7 @@ func newMemLimitTestPods(numPods int, imageName, podType string, memoryLimit str
},
},
NodeSelector: map[string]string{
"beta.kubernetes.io/os": "windows",
"kubernetes.io/os": "windows",
},
},
}
@ -181,7 +181,7 @@ func newMemLimitTestPods(numPods int, imageName, podType string, memoryLimit str
// getNodeMemory populates a nodeMemory struct with information from the first
func getNodeMemory(f *framework.Framework) nodeMemory {
selector := labels.Set{"beta.kubernetes.io/os": "windows"}.AsSelector()
selector := labels.Set{"kubernetes.io/os": "windows"}.AsSelector()
nodeList, err := f.ClientSet.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{
LabelSelector: selector.String(),
})
@ -232,7 +232,7 @@ func getNodeMemory(f *framework.Framework) nodeMemory {
// getTotalAllocatableMemory gets the sum of all agent node's allocatable memory
func getTotalAllocatableMemory(f *framework.Framework) *resource.Quantity {
selector := labels.Set{"beta.kubernetes.io/os": "windows"}.AsSelector()
selector := labels.Set{"kubernetes.io/os": "windows"}.AsSelector()
nodeList, err := f.ClientSet.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{
LabelSelector: selector.String(),
})