From a6ff2364c5bdcd0a40b42c283062a21a819b5d84 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Thu, 25 Aug 2016 12:45:40 -0700 Subject: [PATCH] Addressed review comments. --- build/common.sh | 2 +- federation/deploy/deploy.sh | 4 ++-- hack/verify-flags/exceptions.txt | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build/common.sh b/build/common.sh index b8a5d64f486..41bf988ae1e 100755 --- a/build/common.sh +++ b/build/common.sh @@ -1040,7 +1040,7 @@ function kube::release::package_full_tarball() { mkdir "${release_stage}/federation" cp -R "${KUBE_ROOT}/federation/cluster" "${release_stage}/federation/" cp -R "${KUBE_ROOT}/federation/manifests" "${release_stage}/federation/" - cp -R "${KUBE_ROOT}/federation/deploy" "${release_stage}/federation" + cp -R "${KUBE_ROOT}/federation/deploy" "${release_stage}/federation/" cp -R "${KUBE_ROOT}/examples" "${release_stage}/" cp -R "${KUBE_ROOT}/docs" "${release_stage}/" diff --git a/federation/deploy/deploy.sh b/federation/deploy/deploy.sh index 93342e9124c..a91c604d15c 100755 --- a/federation/deploy/deploy.sh +++ b/federation/deploy/deploy.sh @@ -52,8 +52,8 @@ function pull_installer() { function ensure_files() { kube::log::status "Ensure provider is supported" - if [[ "${KUBERNETES_PROVIDER:-}" != "gce" ]]; then - echo "Supported providers: \"gce\"" + if [[ "${KUBERNETES_PROVIDER:-}" != "gce" && "${KUBERNETES_PROVIDER:-}" != "gke" ]]; then + echo "Supported providers: \"gce\", \"gke\"" exit 1 fi diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index 1cc45f4a264..c2593c89cd6 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -72,18 +72,18 @@ examples/cluster-dns/images/frontend/client.py: service_address = socket.gethos examples/storage/cassandra/image/run.sh: cluster_name \ examples/storage/vitess/env.sh: node_ip=$(get_node_ip) federation/cluster/common.sh: local cert_dir="${kube_temp}/easy-rsa-master/easyrsa3" -federation/config.default.json: "cloud_provider": "gce", -federation/config.default.json: "cloud_provider": "gce", -federation/config.default.json: "cloud_provider": "gce", -federation/config.default.json: "cluster_cidr": "10.180.0.0/14", -federation/config.default.json: "cluster_cidr": "10.184.0.0/14", -federation/config.default.json: "cluster_cidr": "10.188.0.0/14", -federation/config.default.json: "cluster_name": "cluster1-kubernetes", -federation/config.default.json: "cluster_name": "cluster2-kubernetes", -federation/config.default.json: "cluster_name": "cluster3-kubernetes", -federation/config.default.json: "num_nodes": 3, -federation/config.default.json: "num_nodes": 3, -federation/config.default.json: "num_nodes": 3, +federation/deploy/config.json.sample: "cloud_provider": "gce", +federation/deploy/config.json.sample: "cloud_provider": "gce", +federation/deploy/config.json.sample: "cloud_provider": "gce", +federation/deploy/config.json.sample: "cluster_cidr": "10.180.0.0/14", +federation/deploy/config.json.sample: "cluster_cidr": "10.184.0.0/14", +federation/deploy/config.json.sample: "cluster_cidr": "10.188.0.0/14", +federation/deploy/config.json.sample: "cluster_name": "cluster1-kubernetes", +federation/deploy/config.json.sample: "cluster_name": "cluster2-kubernetes", +federation/deploy/config.json.sample: "cluster_name": "cluster3-kubernetes", +federation/deploy/config.json.sample: "num_nodes": 3, +federation/deploy/config.json.sample: "num_nodes": 3, +federation/deploy/config.json.sample: "num_nodes": 3, hack/local-up-cluster.sh: advertise_address="--advertise_address=${API_HOST}" hack/local-up-cluster.sh: runtime_config="--runtime-config=${RUNTIME_CONFIG}" hack/local-up-cluster.sh: advertise_address=""