From 1c8b418383c18c2142d103017b58655e37f99cf5 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Wed, 27 Jul 2016 19:31:29 -0700 Subject: [PATCH] Docs munger and flags verification fixes. --- federation/README.md | 3 +++ hack/verify-flags/exceptions.txt | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/federation/README.md b/federation/README.md index 771dfccda3d..6c47a4616af 100644 --- a/federation/README.md +++ b/federation/README.md @@ -56,3 +56,6 @@ make build do=destroy The bash script sets `set -e errexit` which causes the script to exit at the very first error. This should be the default mode for deploying components but not for destroying/cleanup. + + +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/federation/README.md?pixel)]() diff --git a/hack/verify-flags/exceptions.txt b/hack/verify-flags/exceptions.txt index ab1a6e1de0c..c90ce6f2398 100644 --- a/hack/verify-flags/exceptions.txt +++ b/hack/verify-flags/exceptions.txt @@ -64,6 +64,18 @@ cluster/vsphere/templates/salt-minion.sh: hostname_override: $(ip route get 1.1 examples/cluster-dns/images/frontend/client.py: service_address = socket.gethostbyname(hostname) examples/storage/cassandra/image/run.sh: cluster_name \ examples/storage/vitess/env.sh: node_ip=$(get_node_ip) +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, 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=""