Merge pull request #47130 from shashidharatd/fed-cluster-scripts-cleanup

federation/cluster/BUILD

@@ -2,24 +2,6 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_binary",
-    "go_library",
-)
-
-go_binary(
-    name = "cluster",
-    library = ":go_default_library",
-    tags = ["automanaged"],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["template.go"],
-    tags = ["automanaged"],
-)
-
 filegroup(
     name = "package-srcs",
     srcs = glob(["**"]),

federation/cluster/federation-down.sh

@@ -21,8 +21,7 @@ set -o pipefail
 KUBE_ROOT=$(readlink -m $(dirname "${BASH_SOURCE}")/../../)
 
 # For $FEDERATION_NAME, $FEDERATION_NAMESPACE, $FEDERATION_KUBE_CONTEXT,
-# $HOST_CLUSTER_CONTEXT, $KUBEDNS_CONFIGMAP_NAME and
-# $KUBEDNS_CONFIGMAP_NAMESPACE.
+# and $HOST_CLUSTER_CONTEXT.
 source "${KUBE_ROOT}/federation/cluster/common.sh"
 
 # federation_clusters returns a list of all the clusters in

federation/cluster/federation-up.sh

@@ -30,8 +30,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 # "${KUBE_ROOT}/cluster/lib/logging.sh" and DEFAULT_KUBECONFIG
 source "${KUBE_ROOT}/cluster/common.sh"
 # For $FEDERATION_NAME, $FEDERATION_NAMESPACE, $FEDERATION_KUBE_CONTEXT,
-# $HOST_CLUSTER_CONTEXT, $KUBEDNS_CONFIGMAP_NAME,
-# $KUBEDNS_CONFIGMAP_NAMESPACE and $KUBEDNS_FEDERATION_FLAG.
+# and $HOST_CLUSTER_CONTEXT.
 source "${KUBE_ROOT}/federation/cluster/common.sh"
 
 DNS_ZONE_NAME="${FEDERATION_DNS_ZONE_NAME:-}"
@@ -125,12 +124,5 @@ function join_clusters() {
   done
 }
 
-USE_KUBEFED="${USE_KUBEFED:-}"
-
-if [[ "${USE_KUBEFED}" == "true" ]]; then
-  init
-  join_clusters
-else
-  export FEDERATION_IMAGE_TAG="$(get_version)"
-  create-federation-api-objects
-fi
+init
+join_clusters

federation/cluster/template.go

-/*
-Copyright 2016 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.
-*/
-
-/*
-This is a simple script that makes *every* environment variable available
-as a go template field of the same name
-
-$ echo "hello world, MYVAR={{.MYVAR}}" > test.txt
-$ MYVAR=foobar go run template.go test.txt
-> hello world, MYVAR=foobar
-
-If you want the base64 version of any MYVAR, simple use {{.MYVAR_BASE64}}
-*/
-
-package main
-
-import (
-	"encoding/base64"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"strings"
-	"text/template"
-)
-
-func main() {
-	flag.Parse()
-	env := make(map[string]string)
-	envList := os.Environ()
-
-	for i := range envList {
-		pieces := strings.SplitN(envList[i], "=", 2)
-		if len(pieces) == 2 {
-			env[pieces[0]] = pieces[1]
-			env[pieces[0]+"_BASE64"] = base64.StdEncoding.EncodeToString([]byte(pieces[1]))
-		} else {
-			fmt.Fprintf(os.Stderr, "Invalid environ found: %s\n", envList[i])
-			os.Exit(2)
-		}
-	}
-
-	for i := 0; i < flag.NArg(); i++ {
-		inpath := flag.Arg(i)
-
-		if err := templateYamlFile(env, inpath, os.Stdout); err != nil {
-			panic(err)
-		}
-	}
-}
-
-func templateYamlFile(params map[string]string, inpath string, out io.Writer) error {
-	if tmpl, err := template.New(path.Base(inpath)).Option("missingkey=zero").ParseFiles(inpath); err != nil {
-		return err
-	} else {
-		if err := tmpl.Execute(out, params); err != nil {
-			return err
-		}
-	}
-	_, err := out.Write([]byte("\n---\n"))
-	return err
-}