Merge pull request #27961 from maisem/os-distribution

Automatic merge from submit-queue

Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and MASTER_OS_DISTRIBUTION

fixes #26183 
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
This commit is contained in:
k8s-merge-robot
2016-07-15 14:11:47 -07:00
committed by GitHub
23 changed files with 334 additions and 205 deletions

View File

@@ -13,7 +13,7 @@ cluster/gce/configure-vm.sh: api_servers: '${KUBERNETES_MASTER_NAME}'
cluster/gce/configure-vm.sh: cloud_config: ${CLOUD_CONFIG}
cluster/gce/configure-vm.sh: env-to-grains "runtime_config"
cluster/gce/configure-vm.sh: kubelet_api_servers: '${KUBELET_APISERVER}'
cluster/gce/coreos/helper.sh:# cloud_config yaml file should be passed
cluster/gce/coreos/node-helper.sh:# cloud_config yaml file should be passed
cluster/gce/gci/configure-helper.sh: reconcile_cidr="false"
cluster/gce/gci/configure-helper.sh: local api_servers="--master=https://${KUBERNETES_MASTER_NAME}"
cluster/gce/gci/configure-helper.sh: local reconcile_cidr="true"

View File

@@ -281,6 +281,7 @@ make-symlinks
manifest-url
manifest-url-header
masquerade-all
master-os-distro
master-service-namespace
max-concurrency
max-connection-bytes-per-sec
@@ -328,6 +329,7 @@ node-labels
node-monitor-grace-period
node-monitor-period
node-name
node-os-distro
node-startup-grace-period
node-status-update-frequency
node-sync-period
@@ -340,7 +342,6 @@ oidc-issuer-url
oidc-username-claim
only-idl
oom-score-adj
os-distro
out-version
outofdisk-transition-frequency
output-base