From 9b2b763ab0300c8e3077b26d79910c926ecb22d4 Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Mon, 13 Jun 2016 11:20:55 -0700 Subject: [PATCH] Fixing references to federated-context and federation-e2e --- federation/cluster/federation-up.sh | 7 +++++-- hack/e2e-internal/e2e-status.sh | 2 +- hack/e2e-internal/e2e-up.sh | 8 ++++++-- test/e2e/federation-apiserver.go | 2 +- test/e2e/framework/framework.go | 2 +- test/e2e/framework/test_context.go | 2 +- test/e2e/framework/util.go | 2 +- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/federation/cluster/federation-up.sh b/federation/cluster/federation-up.sh index 9599d54e24..3c8680189c 100755 --- a/federation/cluster/federation-up.sh +++ b/federation/cluster/federation-up.sh @@ -22,8 +22,11 @@ KUBE_ROOT=$(readlink -m $(dirname "${BASH_SOURCE}")/../../) . ${KUBE_ROOT}/federation/cluster/common.sh -if [[ -f "${KUBE_ROOT}/federation/manifests/federated-image.tag" ]]; then - export FEDERATION_IMAGE_TAG="$(cat "${KUBE_ROOT}/federation/manifests/federated-image.tag")" +tagfile="${KUBE_ROOT}/federation/manifests/federated-image.tag" +if [[ ! -f "$tagfile" ]]; then + echo "FATAL: tagfile ${tagfile} does not exist. Make sure that you have run build/push-federation-images.sh" + exit 1 fi +export FEDERATION_IMAGE_TAG="$(cat "${KUBE_ROOT}/federation/manifests/federated-image.tag")" create-federation-api-objects diff --git a/hack/e2e-internal/e2e-status.sh b/hack/e2e-internal/e2e-status.sh index df171bb546..f26530190b 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-e2e} + FEDERATION_NAMESPACE=${FEDERATION_NAMESPACE:-federation} #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/hack/e2e-internal/e2e-up.sh b/hack/e2e-internal/e2e-up.sh index 8d2a501dcf..eea67d4b87 100755 --- a/hack/e2e-internal/e2e-up.sh +++ b/hack/e2e-internal/e2e-up.sh @@ -40,9 +40,13 @@ if [[ "${FEDERATION:-}" == "true" ]];then test-setup ) done - if [[ -f "${KUBE_ROOT}/federation/manifests/federated-image.tag" ]];then - export FEDERATION_IMAGE_TAG="$(cat "${KUBE_ROOT}/federation/manifests/federated-image.tag")" + tagfile="${KUBE_ROOT}/federation/manifests/federated-image.tag" + if [[ ! -f "$tagfile" ]]; then + echo "FATAL: tagfile ${tagfile} does not exist. Make sure that you have run build/push-federation-images.sh" + exit 1 fi + export FEDERATION_IMAGE_TAG="$(cat "${KUBE_ROOT}/federation/manifests/federated-image.tag")" + "${KUBE_ROOT}/federation/cluster/federation-up.sh" else test-setup diff --git a/test/e2e/federation-apiserver.go b/test/e2e/federation-apiserver.go index c0c39fbc4a..656a127fb9 100644 --- a/test/e2e/federation-apiserver.go +++ b/test/e2e/federation-apiserver.go @@ -27,7 +27,7 @@ import ( // Create/delete cluster api objects var _ = framework.KubeDescribe("Federation apiserver [Feature:Federation]", func() { - f := framework.NewDefaultFederatedFramework("federated-cluster") + f := framework.NewDefaultFederatedFramework("federation-cluster") It("should allow creation of cluster api objects", func() { framework.SkipUnlessFederated(f.Client) diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 07ff5df7aa..19bf34ed3f 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -586,7 +586,7 @@ func (f *Framework) GetUnderlyingFederatedContexts() []E2EContext { e2eContexts := []E2EContext{} for _, context := range kubeconfig.Contexts { - if strings.HasPrefix(context.Name, "federation-e2e") { + if strings.HasPrefix(context.Name, "federation") { user := kubeconfig.findUser(context.Context.User) if user == nil { diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go index d8bac29c26..c998331e0b 100644 --- a/test/e2e/framework/test_context.go +++ b/test/e2e/framework/test_context.go @@ -92,7 +92,7 @@ func RegisterFlags() { flag.StringVar(&TestContext.KubeConfig, clientcmd.RecommendedConfigPathFlag, os.Getenv(clientcmd.RecommendedConfigPathEnvVar), "Path to kubeconfig containing embedded authinfo.") flag.StringVar(&TestContext.KubeContext, clientcmd.FlagContext, "", "kubeconfig context to use/override. If unset, will use value from 'current-context'") flag.StringVar(&TestContext.KubeAPIContentType, "kube-api-content-type", "", "ContentType used to communicate with apiserver") - flag.StringVar(&federatedKubeContext, "federated-kube-context", "federated-cluster", "kubeconfig context for federated-cluster.") + flag.StringVar(&federatedKubeContext, "federated-kube-context", "federation-cluster", "kubeconfig context for federation-cluster.") flag.StringVar(&TestContext.KubeVolumeDir, "volume-dir", "/var/lib/kubelet", "Path to the directory containing the kubelet volumes.") flag.StringVar(&TestContext.CertDir, "cert-dir", "", "Path to the directory containing the certs. Default is empty, which doesn't use certs.") diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index ba9f17e898..0071406da7 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -383,7 +383,7 @@ func SkipUnlessServerVersionGTE(v semver.Version, c discovery.ServerVersionInter func SkipUnlessFederated(c *client.Client) { federationNS := os.Getenv("FEDERATION_NAMESPACE") if federationNS == "" { - federationNS = "federation-e2e" + federationNS = "federation" } _, err := c.Namespaces().Get(federationNS)