From b58216e333f2d0b83a383be6f3262c8b84ecd6bd Mon Sep 17 00:00:00 2001 From: shashidharatd Date: Wed, 14 Dec 2016 14:22:01 +0530 Subject: [PATCH] Stop cleaning federation namespace in e2e tests --- federation/apis/federation/v1beta1/types.go | 5 +++++ federation/cluster/common.sh | 1 + hack/e2e-internal/e2e-status.sh | 2 +- test/e2e/e2e.go | 3 ++- test/e2e/framework/BUILD | 1 + test/e2e/framework/util.go | 3 ++- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/federation/apis/federation/v1beta1/types.go b/federation/apis/federation/v1beta1/types.go index 6dc3d3c7f7..429ba1b946 100644 --- a/federation/apis/federation/v1beta1/types.go +++ b/federation/apis/federation/v1beta1/types.go @@ -120,3 +120,8 @@ type ClusterList struct { // List of Cluster objects. Items []Cluster `json:"items" protobuf:"bytes,2,rep,name=items"` } + +const ( + // FederationNamespaceSystem is the system namespace where we place federation control plane components. + FederationNamespaceSystem string = "federation-system" +) diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh index e4e10302b3..3a68d97048 100644 --- a/federation/cluster/common.sh +++ b/federation/cluster/common.sh @@ -351,6 +351,7 @@ function push-federation-images { } function cleanup-federation-api-objects { + echo "Cleaning Federation control plane objects" # Delete all resources with the federated-cluster label. $host_kubectl delete pods,svc,rc,deployment,secret -lapp=federated-cluster # Delete all resources in FEDERATION_NAMESPACE. diff --git a/hack/e2e-internal/e2e-status.sh b/hack/e2e-internal/e2e-status.sh index ee321aa242..3e5303513c 100755 --- a/hack/e2e-internal/e2e-status.sh +++ b/hack/e2e-internal/e2e-status.sh @@ -30,7 +30,7 @@ source "${KUBE_ROOT}/cluster/kube-util.sh" prepare-e2e if [[ "${FEDERATION:-}" == "true" ]];then - FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation} + FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation-system} #TODO(colhom): the last cluster that was created in the loop above is the current context. # Hence, it will be the cluster that hosts the federated components. # In the future, we will want to loop through the all the federated contexts, diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index 0e2870f47f..800913c5c8 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -30,6 +30,7 @@ import ( "github.com/onsi/ginkgo/reporters" "github.com/onsi/gomega" + federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" @@ -108,7 +109,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte { // Delete any namespaces except default and kube-system. This ensures no // lingering resources are left over from a previous test run. if framework.TestContext.CleanStart { - deleted, err := framework.DeleteNamespaces(c, nil /* deleteFilter */, []string{api.NamespaceSystem, v1.NamespaceDefault}) + deleted, err := framework.DeleteNamespaces(c, nil /* deleteFilter */, []string{api.NamespaceSystem, v1.NamespaceDefault, federationapi.FederationNamespaceSystem}) if err != nil { framework.Failf("Error deleting orphaned namespaces: %v", err) } diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 342628a7ce..d90c9571bf 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -29,6 +29,7 @@ go_library( ], tags = ["automanaged"], deps = [ + "//federation/apis/federation/v1beta1:go_default_library", "//federation/client/clientset_generated/federation_clientset:go_default_library", "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index ad1de77e32..98a4ea7f62 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -49,6 +49,7 @@ import ( . "github.com/onsi/gomega" gomegatypes "github.com/onsi/gomega/types" + federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" @@ -363,7 +364,7 @@ func SkipUnlessServerVersionGTE(v *utilversion.Version, c discovery.ServerVersio func SkipUnlessFederated(c clientset.Interface) { federationNS := os.Getenv("FEDERATION_NAMESPACE") if federationNS == "" { - federationNS = "federation-system" + federationNS = federationapi.FederationNamespaceSystem } _, err := c.Core().Namespaces().Get(federationNS, metav1.GetOptions{})