Merge pull request kubernetes#75002 from rramkumar1/remove-ingress-upgrade-tests

Remove Ingress-GCE upgrade + downgrade tests from k/k

Author: k8s-ci-robot

test/e2e/framework/nodes_util.go

@@ -39,15 +39,6 @@ func EtcdUpgrade(target_storage, target_version string) error {
 	}
 }
 
-func IngressUpgrade(isUpgrade bool) error {
-	switch TestContext.Provider {
-	case "gce":
-		return ingressUpgradeGCE(isUpgrade)
-	default:
-		return fmt.Errorf("IngressUpgrade() is not implemented for provider %s", TestContext.Provider)
-	}
-}
-
 func MasterUpgrade(v string) error {
 	switch TestContext.Provider {
 	case "gce":
@@ -72,27 +63,6 @@ func etcdUpgradeGCE(target_storage, target_version string) error {
 	return err
 }
 
-func ingressUpgradeGCE(isUpgrade bool) error {
-	var command string
-	if isUpgrade {
-		// User specified image to upgrade to.
-		targetImage := TestContext.IngressUpgradeImage
-		if targetImage != "" {
-			command = fmt.Sprintf("sudo sed -i -re 's|(image:)(.*)|\\1 %s|' /etc/kubernetes/manifests/glbc.manifest", targetImage)
-		} else {
-			// Upgrade to latest HEAD image.
-			command = "sudo sed -i -re 's/(image:)(.*)/\\1 gcr.io\\/k8s-ingress-image-push\\/ingress-gce-e2e-glbc-amd64:master/' /etc/kubernetes/manifests/glbc.manifest"
-		}
-	} else {
-		// Downgrade to latest release image.
-		command = "sudo sed -i -re 's/(image:)(.*)/\\1 k8s.gcr.io\\/ingress-gce-glbc-amd64:v1.1.1/' /etc/kubernetes/manifests/glbc.manifest"
-	}
-	// Kubelet should restart glbc automatically.
-	sshResult, err := NodeExec(GetMasterHost(), command)
-	LogSSHResult(sshResult)
-	return err
-}
-
 // TODO(mrhohn): Remove this function when kube-proxy is run as a DaemonSet by default.
 func MasterUpgradeGCEWithKubeProxyDaemonSet(v string, enableKubeProxyDaemonSet bool) error {
 	return masterUpgradeGCE(v, enableKubeProxyDaemonSet)

test/e2e/framework/test_context.go

@@ -100,7 +100,6 @@ type TestContextType struct {
 	SystemPodsStartupTimeout    time.Duration
 	EtcdUpgradeStorage          string
 	EtcdUpgradeVersion          string
-	IngressUpgradeImage         string
 	GCEUpgradeScript            string
 	ContainerRuntime            string
 	ContainerRuntimeEndpoint    string
@@ -316,7 +315,6 @@ func RegisterClusterFlags() {
 	flag.DurationVar(&TestContext.SystemDaemonsetStartupTimeout, "system-daemonsets-startup-timeout", 5*time.Minute, "Timeout for waiting for all system daemonsets to be ready.")
 	flag.StringVar(&TestContext.EtcdUpgradeStorage, "etcd-upgrade-storage", "", "The storage version to upgrade to (either 'etcdv2' or 'etcdv3') if doing an etcd upgrade test.")
 	flag.StringVar(&TestContext.EtcdUpgradeVersion, "etcd-upgrade-version", "", "The etcd binary version to upgrade to (e.g., '3.0.14', '2.3.7') if doing an etcd upgrade test.")
-	flag.StringVar(&TestContext.IngressUpgradeImage, "ingress-upgrade-image", "", "Image to upgrade to if doing an upgrade test for ingress.")
 	flag.StringVar(&TestContext.GCEUpgradeScript, "gce-upgrade-script", "", "Script to use to upgrade a GCE cluster.")
 	flag.BoolVar(&TestContext.CleanStart, "clean-start", false, "If true, purge all namespaces except default and system before running tests. This serves to Cleanup test namespaces from failed/interrupted e2e runs in a long-lived cluster.")
 

test/e2e/lifecycle/cluster_upgrade.go

@@ -56,7 +56,6 @@ var upgradeTests = []upgrades.Test{
 	&upgrades.HPAUpgradeTest{},
 	&storage.PersistentVolumeUpgradeTest{},
 	&apps.DaemonSetUpgradeTest{},
-	&upgrades.IngressUpgradeTest{},
 	&upgrades.AppArmorUpgradeTest{},
 	&storage.VolumeModeDowngradeTest{},
 }
@@ -74,18 +73,11 @@ var statefulsetUpgradeTests = []upgrades.Test{
 var kubeProxyUpgradeTests = []upgrades.Test{
 	&upgrades.KubeProxyUpgradeTest{},
 	&upgrades.ServiceUpgradeTest{},
-	&upgrades.IngressUpgradeTest{},
 }
 
 var kubeProxyDowngradeTests = []upgrades.Test{
 	&upgrades.KubeProxyDowngradeTest{},
 	&upgrades.ServiceUpgradeTest{},
-	&upgrades.IngressUpgradeTest{},
-}
-
-// Forcefully swap ingress image.
-var ingressUpgradeTests = []upgrades.Test{
-	&upgrades.IngressUpgradeTest{},
 }
 
 var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
@@ -217,56 +209,6 @@ var _ = SIGDescribe("etcd Upgrade [Feature:EtcdUpgrade]", func() {
 	})
 })
 
-var _ = SIGDescribe("ingress Upgrade [Feature:IngressUpgrade]", func() {
-	f := framework.NewDefaultFramework("ingress-upgrade")
-
-	// Create the frameworks here because we can only create them
-	// in a "Describe".
-	testFrameworks := createUpgradeFrameworks(ingressUpgradeTests)
-	Describe("ingress upgrade", func() {
-		It("should maintain a functioning ingress", func() {
-			upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), "")
-			framework.ExpectNoError(err)
-
-			testSuite := &junit.TestSuite{Name: "ingress upgrade"}
-			ingressTest := &junit.TestCase{Name: "[sig-networking] ingress-upgrade", Classname: "upgrade_tests"}
-			testSuite.TestCases = append(testSuite.TestCases, ingressTest)
-
-			upgradeFunc := func() {
-				start := time.Now()
-				defer finalizeUpgradeTest(start, ingressTest)
-				framework.ExpectNoError(framework.IngressUpgrade(true))
-			}
-			runUpgradeSuite(f, ingressUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.IngressUpgrade, upgradeFunc)
-		})
-	})
-})
-
-var _ = SIGDescribe("ingress Downgrade [Feature:IngressDowngrade]", func() {
-	f := framework.NewDefaultFramework("ingress-downgrade")
-
-	// Create the frameworks here because we can only create them
-	// in a "Describe".
-	testFrameworks := createUpgradeFrameworks(ingressUpgradeTests)
-	Describe("ingress downgrade", func() {
-		It("should maintain a functioning ingress", func() {
-			upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), "")
-			framework.ExpectNoError(err)
-
-			testSuite := &junit.TestSuite{Name: "ingress downgrade"}
-			ingressTest := &junit.TestCase{Name: "[sig-networking] ingress-downgrade", Classname: "upgrade_tests"}
-			testSuite.TestCases = append(testSuite.TestCases, ingressTest)
-
-			upgradeFunc := func() {
-				start := time.Now()
-				defer finalizeUpgradeTest(start, ingressTest)
-				framework.ExpectNoError(framework.IngressUpgrade(false))
-			}
-			runUpgradeSuite(f, ingressUpgradeTests, testFrameworks, testSuite, upgCtx, upgrades.IngressUpgrade, upgradeFunc)
-		})
-	})
-})
-
 var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
 	f := framework.NewDefaultFramework("gpu-upgrade")
 

test/e2e/upgrades/BUILD

@@ -13,7 +13,6 @@ go_library(
         "configmaps.go",
         "etcd.go",
         "horizontal_pod_autoscalers.go",
-        "ingress.go",
         "kube_proxy_migration.go",
         "mysql.go",
         "nvidia-gpu.go",
@@ -28,7 +27,6 @@ go_library(
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
-        "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -39,16 +37,12 @@ go_library(
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//test/e2e/common:go_default_library",
         "//test/e2e/framework:go_default_library",
-        "//test/e2e/framework/ingress:go_default_library",
-        "//test/e2e/framework/providers/gce:go_default_library",
         "//test/e2e/framework/testfiles:go_default_library",
         "//test/e2e/scheduling:go_default_library",
         "//test/utils/image:go_default_library",
-        "//vendor/github.com/davecgh/go-spew/spew:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/github.com/onsi/gomega/gstruct:go_default_library",
-        "//vendor/google.golang.org/api/compute/v1:go_default_library",
     ],
 )