github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/cluster
History
Kubernetes Submit Queue e392f5b08b
Merge pull request #63696 from grosskur/gce-advertise-addr 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

gce: Prefer MASTER_ADVERTISE_ADDRESS in apiserver setup

MASTER_ADVERTISE_ADDRESS is used to set the --advertise-address flag
for the apiserver. It's useful for running the apiserver behind a load
balancer.

However, if PROJECT_ID, TOKEN_URL, TOKEN_BODY, and NODE_NETWORK are
all set, the GCE VM's external IP address will be fetched and used
instead and MASTER_ADVERTISE_ADDRESS will be ignored.

Change this behavior so that MASTER_ADVERTISE_ADDRESS takes precedence
because it's more specific. We still fall back to using the VM's
external IP address if the other variables are set.

Also: Move the setting of --ssh-user and --ssh-keyfile based on
PROXY_SSH_USER) to a top-level block because this is common to all
codepaths.

```release-note
NONE
```
 		2018-05-15 23:25:22 -07:00
..
addons Merge pull request #62905 from serathius/event-exporter-region 2018-05-11 06:00:44 -07:00
centos Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
gce Merge pull request #63696 from grosskur/gce-advertise-addr 2018-05-15 23:25:22 -07:00
images Merge pull request #62508 from dims/allow-customized-image-for-dockerized-kubelet 2018-04-27 21:06:23 -07:00
juju Remove layer:status per review 2018-05-14 13:55:09 -04:00
kubemark Merge pull request #62379 from hzxuzhonghu/e2e-fix 2018-05-14 17:11:17 -07:00
kubernetes-anywhere Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
local Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
log-dump Merge pull request #63357 from Random-Liu/install-and-use-crictl 2018-05-15 21:18:12 -07:00
pre-existing Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
skeleton Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
BUILD Add unit test for configure-helper. 2018-04-23 12:18:57 -07:00
OWNERS
…
README.md
…
clientbin.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
common.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
get-kube-binaries.sh
…
get-kube-local.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
get-kube.sh Remove salt support for providers that no longer exist. 2018-01-12 15:51:23 -08:00
kube-down.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kube-up.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kube-util.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kubeadm.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
kubectl.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
restore-from-backup.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
test-e2e.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
test-network.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
test-smoke.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
update-storage-objects.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00
validate-cluster.sh Update all script to use /usr/bin/env bash in shebang 2018-04-19 13:20:13 +02:00

README.md

Cluster Configuration

Deprecation Notice: This directory has entered maintenance mode and will not be accepting new providers. Please submit new automation deployments to kube-deploy. Deployments in this directory will continue to be maintained and supported at their current level of support.

The scripts and data in this directory automate creation and configuration of a Kubernetes cluster, including networking, DNS, nodes, and master components.

See the getting-started guides for examples of how to use the scripts.

cloudprovider/config-default.sh contains a set of tweakable definitions/parameters for the cluster.

The heavy lifting of configuring the VMs is done by SaltStack.

Analytics