Skip to content

K
k3s
Unverified Commit e8627368 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

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.
parents 7151a59c 0b7e042e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cluster/gce/windows/node-helper.sh
View file @ e8627368
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment