github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Addressed review comments.

Browse Source
This commit is contained in:
Madhusudan.C.S 2016-08-25 12:45:40 -07:00
parent 9650a84f7b
commit a6ff2364c5
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@ -1040,7 +1040,7 @@ function kube::release::package_full_tarball() {
mkdir "${release_stage}/federation" mkdir "${release_stage}/federation"
cp -R "${KUBE_ROOT}/federation/cluster" "${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/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}/examples" "${release_stage}/"
cp -R "${KUBE_ROOT}/docs" "${release_stage}/" cp -R "${KUBE_ROOT}/docs" "${release_stage}/"

4
federation/deploy/deploy.sh
View File

@ -52,8 +52,8 @@ function pull_installer() {
function ensure_files() { function ensure_files() {
kube::log::status "Ensure provider is supported" kube::log::status "Ensure provider is supported"
if [[ "${KUBERNETES_PROVIDER:-}" != "gce" ]]; then if [[ "${KUBERNETES_PROVIDER:-}" != "gce" && "${KUBERNETES_PROVIDER:-}" != "gke" ]]; then
echo "Supported providers: \"gce\"" echo "Supported providers: \"gce\", \"gke\""
exit 1 exit 1
fi fi

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/cassandra/image/run.sh: cluster_name \
examples/storage/vitess/env.sh: node_ip=$(get_node_ip) examples/storage/vitess/env.sh: node_ip=$(get_node_ip)
federation/cluster/common.sh: local cert_dir="${kube_temp}/easy-rsa-master/easyrsa3" federation/cluster/common.sh: local cert_dir="${kube_temp}/easy-rsa-master/easyrsa3"
federation/config.default.json: "cloud_provider": "gce", federation/deploy/config.json.sample: "cloud_provider": "gce",
federation/config.default.json: "cloud_provider": "gce", federation/deploy/config.json.sample: "cloud_provider": "gce",
federation/config.default.json: "cloud_provider": "gce", federation/deploy/config.json.sample: "cloud_provider": "gce",
federation/config.default.json: "cluster_cidr": "10.180.0.0/14", federation/deploy/config.json.sample: "cluster_cidr": "10.180.0.0/14",
federation/config.default.json: "cluster_cidr": "10.184.0.0/14", federation/deploy/config.json.sample: "cluster_cidr": "10.184.0.0/14",
federation/config.default.json: "cluster_cidr": "10.188.0.0/14", federation/deploy/config.json.sample: "cluster_cidr": "10.188.0.0/14",
federation/config.default.json: "cluster_name": "cluster1-kubernetes", federation/deploy/config.json.sample: "cluster_name": "cluster1-kubernetes",
federation/config.default.json: "cluster_name": "cluster2-kubernetes", federation/deploy/config.json.sample: "cluster_name": "cluster2-kubernetes",
federation/config.default.json: "cluster_name": "cluster3-kubernetes", federation/deploy/config.json.sample: "cluster_name": "cluster3-kubernetes",
federation/config.default.json: "num_nodes": 3, federation/deploy/config.json.sample: "num_nodes": 3,
federation/config.default.json: "num_nodes": 3, federation/deploy/config.json.sample: "num_nodes": 3,
federation/config.default.json: "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: advertise_address="--advertise_address=${API_HOST}"
hack/local-up-cluster.sh: runtime_config="--runtime-config=${RUNTIME_CONFIG}" hack/local-up-cluster.sh: runtime_config="--runtime-config=${RUNTIME_CONFIG}"
hack/local-up-cluster.sh: advertise_address="" hack/local-up-cluster.sh: advertise_address=""