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

Merge pull request #22969 from nikhiljindal/upgradeTest

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-15 12:45:52 -07:00
commit 52b061a4d3
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e/kubectl.go
View File

@ -101,6 +101,12 @@ var (
//
// TODO(ihmccreery): remove once we don't care about v1.1 anymore, (tentatively in v1.4).
deploymentsVersion = version.MustParse("v1.2.0-alpha.7.726")
// Pod probe parameters were introduced in #15967 (v1.2) so we dont expect tests that use
// these probe parameters to work on clusters before that.
//
// TODO(ihmccreery): remove once we don't care about v1.1 anymore, (tentatively in v1.4).
podProbeParametersVersion = version.MustParse("v1.2.0-alpha.4")
)
var _ = Describe("Kubectl client", func() {
@ -271,7 +277,18 @@ var _ = Describe("Kubectl client", func() {
}
// start exec-proxy-tester container
netexecPodPath := filepath.Join(testContext.RepoRoot, "test/images/netexec/pod.yaml")
runKubectlOrDie("create", "-f", netexecPodPath, fmt.Sprintf("--namespace=%v", ns))
// Add "validate=false" if the server version is less than 1.2.
// More details: https://github.com/kubernetes/kubernetes/issues/22884.
validateFlag := "--validate=true"
gte, err := serverVersionGTE(podProbeParametersVersion, c)
if err != nil {
Failf("Failed to get server version: %v", err)
}
if !gte {
validateFlag = "--validate=false"
}
runKubectlOrDie("create", "-f", netexecPodPath, fmt.Sprintf("--namespace=%v", ns), validateFlag)
checkPodsRunningReady(c, ns, []string{netexecContainer}, podStartTimeout)
// Clean up
defer cleanup(netexecPodPath, ns, netexecPodSelector)