github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88092 from yujuhong/rm-beta-labels

Browse Source 
Replace Beta OS/arch labels with the GA ones
This commit is contained in:
Kubernetes Prow Robot
2020-02-13 14:14:02 -08:00
committed by GitHub
parent 98709f9821 bcd975aa65
commit 35bb71d855
19 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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(),
})