Merge pull request #83744 from neolit123/1.17-move-test-owners-sig-cl-gcp

test/e2e: move some tests from cluster-lifecycle to cloud-provider-gcp

hack/.staticcheck_failures

@@ -80,7 +80,6 @@ test/e2e/autoscaling
 test/e2e/common
 test/e2e/instrumentation/logging/stackdriver
 test/e2e/instrumentation/monitoring
-test/e2e/lifecycle
 test/e2e/manifest
 test/e2e/network
 test/e2e/storage

test/e2e/cloud/BUILD

@@ -28,7 +28,10 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [":package-srcs"],
+    srcs = [
+        ":package-srcs",
+        "//test/e2e/cloud/gcp:all-srcs",
+    ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],
 )

test/e2e/cloud/gcp/BUILD

@@ -0,0 +1,63 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "addon_update.go",
+        "cluster_upgrade.go",
+        "framework.go",
+        "ha_master.go",
+        "kubelet_security.go",
+        "node_lease.go",
+        "reboot.go",
+        "resize_nodes.go",
+        "restart.go",
+    ],
+    importpath = "k8s.io/kubernetes/test/e2e/cloud/gcp",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/apis/core:go_default_library",
+        "//pkg/master/ports:go_default_library",
+        "//staging/src/k8s.io/api/core/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
+        "//staging/src/k8s.io/client-go/discovery:go_default_library",
+        "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
+        "//test/e2e/chaosmonkey:go_default_library",
+        "//test/e2e/common:go_default_library",
+        "//test/e2e/framework:go_default_library",
+        "//test/e2e/framework/config:go_default_library",
+        "//test/e2e/framework/ginkgowrapper:go_default_library",
+        "//test/e2e/framework/kubelet:go_default_library",
+        "//test/e2e/framework/lifecycle:go_default_library",
+        "//test/e2e/framework/node:go_default_library",
+        "//test/e2e/framework/pod:go_default_library",
+        "//test/e2e/framework/ssh:go_default_library",
+        "//test/e2e/upgrades:go_default_library",
+        "//test/e2e/upgrades/apps:go_default_library",
+        "//test/e2e/upgrades/storage:go_default_library",
+        "//test/utils:go_default_library",
+        "//test/utils/image:go_default_library",
+        "//test/utils/junit:go_default_library",
+        "//vendor/github.com/onsi/ginkgo:go_default_library",
+        "//vendor/github.com/onsi/gomega:go_default_library",
+        "//vendor/golang.org/x/crypto/ssh:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)

test/e2e/cloud/gcp/OWNERS

@@ -0,0 +1,11 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+approvers:
+- cheftako
+- justinsb
+reviewers:
+- cheftako
+- justinsb
+
+labels:
+- sig/cloud-provider

test/e2e/cloud/gcp/addon_update.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package lifecycle
+package gcp
 
 import (
 	"bytes"

test/e2e/cloud/gcp/cluster_upgrade.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package lifecycle
+package gcp
 
 import (
 	"encoding/xml"
@@ -94,7 +94,7 @@ var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
 
 			testSuite := &junit.TestSuite{Name: "Master upgrade"}
 			masterUpgradeTest := &junit.TestCase{
-				Name:      "[sig-cluster-lifecycle] master-upgrade",
+				Name:      "[sig-cloud-provider-gcp] master-upgrade",
 				Classname: "upgrade_tests",
 			}
 			testSuite.TestCases = append(testSuite.TestCases, masterUpgradeTest)
@@ -106,7 +106,7 @@ var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
 				framework.ExpectNoError(framework.MasterUpgrade(target))
 				framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
 			}
-			runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgCtx, upgrades.MasterUpgrade, upgradeFunc)
+			runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgrades.MasterUpgrade, upgradeFunc)
 		})
 	})
 
@@ -128,7 +128,7 @@ var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
 				framework.ExpectNoError(framework.NodeUpgrade(f, target, *upgradeImage))
 				framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
 			}
-			runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgCtx, upgrades.NodeUpgrade, upgradeFunc)
+			runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgrades.NodeUpgrade, upgradeFunc)
 		})
 	})
 
@@ -138,7 +138,7 @@ var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
 			framework.ExpectNoError(err)
 
 			testSuite := &junit.TestSuite{Name: "Cluster upgrade"}
-			clusterUpgradeTest := &junit.TestCase{Name: "[sig-cluster-lifecycle] cluster-upgrade", Classname: "upgrade_tests"}
+			clusterUpgradeTest := &junit.TestCase{Name: "[sig-cloud-provider-gcp] cluster-upgrade", Classname: "upgrade_tests"}
 			testSuite.TestCases = append(testSuite.TestCases, clusterUpgradeTest)
 			upgradeFunc := func() {
 				start := time.Now()
@@ -149,7 +149,7 @@ var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
 				framework.ExpectNoError(framework.NodeUpgrade(f, target, *upgradeImage))
 				framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
 			}
-			runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
+			runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
 		})
 	})
 })
@@ -167,7 +167,7 @@ var _ = SIGDescribe("Downgrade [Feature:Downgrade]", func() {
 			framework.ExpectNoError(err)
 
 			testSuite := &junit.TestSuite{Name: "Cluster downgrade"}
-			clusterDowngradeTest := &junit.TestCase{Name: "[sig-cluster-lifecycle] cluster-downgrade", Classname: "upgrade_tests"}
+			clusterDowngradeTest := &junit.TestCase{Name: "[sig-cloud-provider-gcp] cluster-downgrade", Classname: "upgrade_tests"}
 			testSuite.TestCases = append(testSuite.TestCases, clusterDowngradeTest)
 
 			upgradeFunc := func() {
@@ -180,7 +180,7 @@ var _ = SIGDescribe("Downgrade [Feature:Downgrade]", func() {
 				framework.ExpectNoError(framework.MasterUpgrade(target))
 				framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
 			}
-			runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
+			runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
 		})
 	})
 })
@@ -193,11 +193,8 @@ var _ = SIGDescribe("etcd Upgrade [Feature:EtcdUpgrade]", func() {
 	testFrameworks := createUpgradeFrameworks(upgradeTests)
 	ginkgo.Describe("etcd upgrade", func() {
 		ginkgo.It("should maintain a functioning cluster", func() {
-			upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), "")
-			framework.ExpectNoError(err)
-
 			testSuite := &junit.TestSuite{Name: "Etcd upgrade"}
-			etcdTest := &junit.TestCase{Name: "[sig-cluster-lifecycle] etcd-upgrade", Classname: "upgrade_tests"}
+			etcdTest := &junit.TestCase{Name: "[sig-cloud-provider-gcp] etcd-upgrade", Classname: "upgrade_tests"}
 			testSuite.TestCases = append(testSuite.TestCases, etcdTest)
 
 			upgradeFunc := func() {
@@ -205,7 +202,7 @@ var _ = SIGDescribe("etcd Upgrade [Feature:EtcdUpgrade]", func() {
 				defer finalizeUpgradeTest(start, etcdTest)
 				framework.ExpectNoError(framework.EtcdUpgrade(framework.TestContext.EtcdUpgradeStorage, framework.TestContext.EtcdUpgradeVersion))
 			}
-			runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgCtx, upgrades.EtcdUpgrade, upgradeFunc)
+			runUpgradeSuite(f, upgradeTests, testFrameworks, testSuite, upgrades.EtcdUpgrade, upgradeFunc)
 		})
 	})
 })
@@ -231,7 +228,7 @@ var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
 				framework.ExpectNoError(framework.MasterUpgrade(target))
 				framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
 			}
-			runUpgradeSuite(f, gpuUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.MasterUpgrade, upgradeFunc)
+			runUpgradeSuite(f, gpuUpgradeTests, testFrameworks, testSuite, upgrades.MasterUpgrade, upgradeFunc)
 		})
 	})
 	ginkgo.Describe("cluster upgrade", func() {
@@ -251,7 +248,7 @@ var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
 				framework.ExpectNoError(framework.NodeUpgrade(f, target, *upgradeImage))
 				framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
 			}
-			runUpgradeSuite(f, gpuUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
+			runUpgradeSuite(f, gpuUpgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
 		})
 	})
 	ginkgo.Describe("cluster downgrade", func() {
@@ -271,7 +268,7 @@ var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
 				framework.ExpectNoError(framework.MasterUpgrade(target))
 				framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
 			}
-			runUpgradeSuite(f, gpuUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
+			runUpgradeSuite(f, gpuUpgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
 		})
 	})
 })
@@ -299,7 +296,7 @@ var _ = ginkgo.Describe("[sig-apps] stateful Upgrade [Feature:StatefulUpgrade]",
 				framework.ExpectNoError(framework.NodeUpgrade(f, target, *upgradeImage))
 				framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
 			}
-			runUpgradeSuite(f, statefulsetUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
+			runUpgradeSuite(f, statefulsetUpgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
 		})
 	})
 })
@@ -334,7 +331,7 @@ var _ = SIGDescribe("kube-proxy migration [Feature:KubeProxyDaemonSetMigration]"
 				framework.ExpectNoError(framework.NodeUpgradeGCEWithKubeProxyDaemonSet(f, target, *upgradeImage, true))
 				framework.ExpectNoError(e2elifecycle.CheckNodesVersions(f.ClientSet, target))
 			}
-			runUpgradeSuite(f, kubeProxyUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
+			runUpgradeSuite(f, kubeProxyUpgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
 		})
 	})
 
@@ -362,7 +359,7 @@ var _ = SIGDescribe("kube-proxy migration [Feature:KubeProxyDaemonSetMigration]"
 				framework.ExpectNoError(framework.MasterUpgradeGCEWithKubeProxyDaemonSet(target, false))
 				framework.ExpectNoError(e2elifecycle.CheckMasterVersion(f.ClientSet, target))
 			}
-			runUpgradeSuite(f, kubeProxyDowngradeTests, testFrameworks, testSuite, upgCtx, upgrades.ClusterUpgrade, upgradeFunc)
+			runUpgradeSuite(f, kubeProxyDowngradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
 		})
 	})
 })
@@ -442,7 +439,6 @@ func runUpgradeSuite(
 	tests []upgrades.Test,
 	testFrameworks map[string]*framework.Framework,
 	testSuite *junit.TestSuite,
-	upgCtx *upgrades.UpgradeContext,
 	upgradeType upgrades.UpgradeType,
 	upgradeFunc func(),
 ) {

test/e2e/cloud/gcp/framework.go

@@ -0,0 +1,24 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package gcp
+
+import "k8s.io/kubernetes/test/e2e/framework"
+
+// SIGDescribe annotates the test with the SIG label.
+func SIGDescribe(text string, body func()) bool {
+	return framework.KubeDescribe("[sig-cloud-provider-gcp] "+text, body)
+}

test/e2e/cloud/gcp/ha_master.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package lifecycle
+package gcp
 
 import (
 	"fmt"

test/e2e/cloud/gcp/kubelet_security.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package lifecycle
+package gcp
 
 import (
 	"fmt"

test/e2e/cloud/gcp/node_lease.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package lifecycle
+package gcp
 
 import (
 	"fmt"

test/e2e/cloud/gcp/reboot.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package lifecycle
+package gcp
 
 import (
 	"fmt"

test/e2e/cloud/gcp/resize_nodes.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package lifecycle
+package gcp
 
 import (
 	"fmt"

test/e2e/cloud/gcp/restart.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package lifecycle
+package gcp
 
 import (
 	"time"

test/e2e/lifecycle/BUILD

@@ -7,49 +7,9 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = [
+    srcs = ["framework.go"],
-        "addon_update.go",
-        "cluster_upgrade.go",
-        "framework.go",
-        "ha_master.go",
-        "kubelet_security.go",
-        "node_lease.go",
-        "reboot.go",
-        "resize_nodes.go",
-        "restart.go",
-    ],
     importpath = "k8s.io/kubernetes/test/e2e/lifecycle",
-    deps = [
+    deps = ["//vendor/github.com/onsi/ginkgo:go_default_library"],
-        "//pkg/apis/core:go_default_library",
-        "//pkg/master/ports:go_default_library",
-        "//staging/src/k8s.io/api/core/v1:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
-        "//staging/src/k8s.io/client-go/discovery:go_default_library",
-        "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
-        "//test/e2e/chaosmonkey:go_default_library",
-        "//test/e2e/common:go_default_library",
-        "//test/e2e/framework:go_default_library",
-        "//test/e2e/framework/config:go_default_library",
-        "//test/e2e/framework/ginkgowrapper:go_default_library",
-        "//test/e2e/framework/kubelet:go_default_library",
-        "//test/e2e/framework/lifecycle:go_default_library",
-        "//test/e2e/framework/node:go_default_library",
-        "//test/e2e/framework/pod:go_default_library",
-        "//test/e2e/framework/ssh:go_default_library",
-        "//test/e2e/upgrades:go_default_library",
-        "//test/e2e/upgrades/apps:go_default_library",
-        "//test/e2e/upgrades/storage:go_default_library",
-        "//test/utils:go_default_library",
-        "//test/utils/image:go_default_library",
-        "//test/utils/junit:go_default_library",
-        "//vendor/github.com/onsi/ginkgo:go_default_library",
-        "//vendor/github.com/onsi/gomega:go_default_library",
-        "//vendor/golang.org/x/crypto/ssh:go_default_library",
-    ],
 )
 
 filegroup(

test/test_owners.csv

@@ -150,13 +150,13 @@ Firewall rule should have correct firewall rules for e2e cluster,MrHohn,0,networ
 GCP Volumes GlusterFS should be mountable,nikhiljindal,0,storage
 GCP Volumes NFSv4 should be mountable for NFSv4,nikhiljindal,0,storage
 GKE local SSD should write and read from node local SSD,fabioy,0,storage
-GKE node pools should create a cluster with multiple node pools,fabioy,1,cluster-lifecycle
+GKE node pools should create a cluster with multiple node pools,fabioy,1,cloud-provider-gcp
-Garbage Collection Test: * Should eventually garbage collect containers when we exceed the number of dead containers per container,Random-Liu,0,cluster-lifecycle
+Garbage Collection Test: * Should eventually garbage collect containers when we exceed the number of dead containers per container,Random-Liu,0,node
-Garbage collector should delete RS created by deployment when not orphaning,rkouj,0,cluster-lifecycle
+Garbage collector should delete RS created by deployment when not orphaning,rkouj,0,cloud-provider-gcp
-Garbage collector should delete pods created by rc when not orphaning,justinsb,1,cluster-lifecycle
+Garbage collector should delete pods created by rc when not orphaning,justinsb,1,cloud-provider-gcp
-Garbage collector should orphan RS created by deployment when deleteOptions.OrphanDependents is true,rkouj,0,cluster-lifecycle
+Garbage collector should orphan RS created by deployment when deleteOptions.OrphanDependents is true,rkouj,0,cloud-provider-gcp
-Garbage collector should orphan pods created by rc if delete options say so,fabioy,1,cluster-lifecycle
+Garbage collector should orphan pods created by rc if delete options say so,fabioy,1,cloud-provider-gcp
-Garbage collector should orphan pods created by rc if deleteOptions.OrphanDependents is nil,zmerlynn,1,cluster-lifecycle
+Garbage collector should orphan pods created by rc if deleteOptions.OrphanDependents is nil,zmerlynn,1,cloud-provider-gcp
 "Generated release_1_5 clientset should create pods, delete pods, watch pods",rrati,0,api-machinery
 "Generated release_1_5 clientset should create v2alpha1 cronJobs, delete cronJobs, watch cronJobs",soltysh,1,api-machinery
 HA-master survive addition/removal replicas different zones,derekwaynecarr,0,api-machinery
@@ -292,8 +292,8 @@ NoExecuteTaintManager eventually evict pod with finite tolerations from tainted
 NoExecuteTaintManager evicts pods from tainted nodes,freehan,0,scheduling
 NoExecuteTaintManager removing taint cancels eviction,freehan,0,scheduling
 NodeProblemDetector KernelMonitor should generate node condition and events for corresponding errors,Random-Liu,0,node
-Nodes Resize should be able to add nodes,piosz,1,cluster-lifecycle
+Nodes Resize should be able to add nodes,piosz,1,cloud-provider-gcp
-Nodes Resize should be able to delete nodes,zmerlynn,1,cluster-lifecycle
+Nodes Resize should be able to delete nodes,zmerlynn,1,cloud-provider-gcp
 Opaque resources should account opaque integer resources in pods with multiple containers.,ConnorDoyle,0,node
 Opaque resources should not break pods that do not consume opaque integer resources.,ConnorDoyle,0,node
 Opaque resources should not schedule pods that exceed the available amount of opaque integer resource.,ConnorDoyle,0,node
@@ -495,9 +495,9 @@ Summary API when querying /stats/summary should report resource usage through th
 Sysctls should reject invalid sysctls,davidopp,1,node
 Sysctls should support sysctls,Random-Liu,1,node
 Sysctls should support unsafe sysctls which are actually whitelisted,deads2k,1,node
-Upgrade cluster upgrade should maintain a functioning cluster,luxas,1,cluster-lifecycle
+Upgrade cluster upgrade should maintain a functioning cluster,justinsb,1,cloud-provider-gcp
-Upgrade master upgrade should maintain a functioning cluster,xiang90,1,cluster-lifecycle
+Upgrade master upgrade should maintain a functioning cluster,justinsb,1,cloud-provider-gcp
-Upgrade node upgrade should maintain a functioning cluster,zmerlynn,1,cluster-lifecycle
+Upgrade node upgrade should maintain a functioning cluster,justinsb,1,cloud-provider-gcp
 Variable Expansion should allow composing env vars into new env vars,derekwaynecarr,0,node
 Variable Expansion should allow substituting values in a container's args,dchen1107,1,node
 Variable Expansion should allow substituting values in a container's command,mml,1,node

test/test_owners.json

@@ -39,7 +39,7 @@
  "cli": [
   "Kubectl"
  ],
- "cluster-lifecycle": [
+ "cloud-provider-gcp": [
   "GKE node",
   "Garbage",
   "Nodes",