github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #75908 from pjh/automated-cherry-pick-of-#75855-upstream-release-1.14 

Automated cherry pick of #75855: Disable GCE agent address management on Windows nodes.
pull/564/head
Kubernetes Prow Robot 2019-04-03 23:47:22 -07:00 committed by GitHub
parent 7151a59cbf 0b7e042e14
commit e862736800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/windows/node-helper.sh
View File

@ -36,6 +36,10 @@ function get-windows-node-instance-metadata-from-file {
function get-windows-node-instance-metadata {
local metadata=""
metadata+="k8s-version=${KUBE_VERSION:-v1.13.2},"
# Prevent the GCE Windows agent from managing IP addresses, since kube-proxy
# and these cluster setup scripts should take care of everything. See
# https://github.com/kubernetes/kubernetes/issues/75561.
metadata+="disable-address-manager=true,"
metadata+="serial-port-enable=1,"
# This enables logging the serial port output.
# https://cloud.google.com/compute/docs/instances/viewing-serial-port-output