scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 18:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop cleaning federation namespace in e2e tests

Browse Source
This commit is contained in:
shashidharatd
2016-12-14 14:22:01 +05:30
parent aa454ec740
commit b58216e333
6 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
federation/apis/federation/v1beta1/types.go
View File

@@ -120,3 +120,8 @@ type ClusterList struct {
// List of Cluster objects. // List of Cluster objects.
Items []Cluster `json:"items" protobuf:"bytes,2,rep,name=items"` 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"
)

1
federation/cluster/common.sh
View File

@@ -351,6 +351,7 @@ function push-federation-images {
} }
function cleanup-federation-api-objects { function cleanup-federation-api-objects {
echo "Cleaning Federation control plane objects"
# Delete all resources with the federated-cluster label. # Delete all resources with the federated-cluster label.
$host_kubectl delete pods,svc,rc,deployment,secret -lapp=federated-cluster $host_kubectl delete pods,svc,rc,deployment,secret -lapp=federated-cluster
# Delete all resources in FEDERATION_NAMESPACE. # Delete all resources in FEDERATION_NAMESPACE.

2
hack/e2e-internal/e2e-status.sh
View File

@@ -30,7 +30,7 @@ source "${KUBE_ROOT}/cluster/kube-util.sh"
prepare-e2e prepare-e2e
if [[ "${FEDERATION:-}" == "true" ]];then 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. #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. # 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, # In the future, we will want to loop through the all the federated contexts,

3
test/e2e/e2e.go
View File

@@ -30,6 +30,7 @@ import (
"github.com/onsi/ginkgo/reporters" "github.com/onsi/ginkgo/reporters"
"github.com/onsi/gomega" "github.com/onsi/gomega"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" 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 // Delete any namespaces except default and kube-system. This ensures no
// lingering resources are left over from a previous test run. // lingering resources are left over from a previous test run.
if framework.TestContext.CleanStart { 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 { if err != nil {
framework.Failf("Error deleting orphaned namespaces: %v", err) framework.Failf("Error deleting orphaned namespaces: %v", err)
} }

1
test/e2e/framework/BUILD
View File

@@ -29,6 +29,7 @@ go_library(
], ],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//federation/apis/federation/v1beta1:go_default_library",
"//federation/client/clientset_generated/federation_clientset:go_default_library", "//federation/client/clientset_generated/federation_clientset:go_default_library",
"//pkg/api:go_default_library", "//pkg/api:go_default_library",
"//pkg/api/errors:go_default_library", "//pkg/api/errors:go_default_library",

3
test/e2e/framework/util.go
View File

@@ -49,6 +49,7 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
gomegatypes "github.com/onsi/gomega/types" 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/federation/client/clientset_generated/federation_clientset"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors" apierrs "k8s.io/kubernetes/pkg/api/errors"
@@ -363,7 +364,7 @@ func SkipUnlessServerVersionGTE(v *utilversion.Version, c discovery.ServerVersio
func SkipUnlessFederated(c clientset.Interface) { func SkipUnlessFederated(c clientset.Interface) {
federationNS := os.Getenv("FEDERATION_NAMESPACE") federationNS := os.Getenv("FEDERATION_NAMESPACE")
if federationNS == "" { if federationNS == "" {
federationNS = "federation-system" federationNS = federationapi.FederationNamespaceSystem
} }
_, err := c.Core().Namespaces().Get(federationNS, metav1.GetOptions{}) _, err := c.Core().Namespaces().Get(federationNS, metav1.GetOptions{})