github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30744 from madhusudancs/fed-split-build-to-develop-deploy

Browse Source 
Automatic merge from submit-queue

Separate federation build.sh into development and deployment scripts.

The idea behind this separation is that it provides a clear distinction
between the dev environment and the prod environment. The
deploy/deploy.sh script will be shipped to the users, but
develop/develop.sh will be purely for development purposes and won't
be part of a release distribution.

Purely for developer convenience, all the deployment functionality is
made available through the develop/develop.sh script.

This change also copies deploy/* files into the release distribution.

cc @kubernetes/sig-cluster-federation @colhom 

```release-note
Federation can now be deployed using the `federation/deploy/deploy.sh` script. This script does not depend on any of the development environment shell library/scripts. This is an alternative to the current `federation-up.sh`/`federation-down.sh` scripts. Both the scripts are going to co-exist in this release, but the `federation-up.sh`/`federation-down.sh` scripts might be removed in a future release in favor of `federation/deploy/deploy.sh` script.
```
This commit is contained in:
Kubernetes Submit Queue
2016-08-29 13:46:19 -07:00
committed by GitHub
parent 033e473e12 a39f8ed943
commit 09a97203aa
7 changed files with 399 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hack/verify-flags/exceptions.txt
View File

@@ -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=""