github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74736 from mtaufen/windows-kube-proxy-config

Browse Source 
Stop setting --hostname-override on Windows kube-proxy and allow args  to be extended remotely if necessary
This commit is contained in:
Kubernetes Prow Robot 2019-03-01 16:12:23 -08:00 committed by GitHub
commit b8e05af7bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cluster/gce/windows/k8s-node-setup.psm1
View File

@ -914,14 +914,24 @@ function Configure-Kubelet {
# KUBERNETES_MASTER_NAME # KUBERNETES_MASTER_NAME
# CLUSTER_IP_RANGE # CLUSTER_IP_RANGE
function Start-WorkerServices { function Start-WorkerServices {
# Compute kubelet args
$kubelet_args_str = ${kube_env}['KUBELET_ARGS'] $kubelet_args_str = ${kube_env}['KUBELET_ARGS']
$kubelet_args = $kubelet_args_str.Split(" ") $kubelet_args = $kubelet_args_str.Split(" ")
Log-Output "kubelet_args from metadata: ${kubelet_args}" Log-Output "kubelet_args from metadata: ${kubelet_args}"
$default_kubelet_args = @(`
$additional_arg_list = @(`
"--pod-infra-container-image=${INFRA_CONTAINER}" "--pod-infra-container-image=${INFRA_CONTAINER}"
) )
$kubelet_args = ${kubelet_args} + ${additional_arg_list} $kubelet_args = ${default_kubelet_args} + ${kubelet_args}
Log-Output "Final kubelet_args: ${kubelet_args}"
# Compute kube-proxy args
$kubeproxy_args_str = ${kube_env}['KUBEPROXY_ARGS']
Try {
$kubeproxy_args = $kubeproxy_args_str.Split(" ")
} Catch {
$kubeproxy_args = ""
}
Log-Output "kubeproxy_args from metadata: ${kubeproxy_args}"
# kubeproxy is started on Linux nodes using # kubeproxy is started on Linux nodes using
# kube-manifests/kubernetes/gci-trusty/kube-proxy.manifest, which is # kube-manifests/kubernetes/gci-trusty/kube-proxy.manifest, which is
@ -934,12 +944,11 @@ function Start-WorkerServices {
# --ipvs-sync-period=1m --ipvs-min-sync-period=10s # --ipvs-sync-period=1m --ipvs-min-sync-period=10s
# And also with various volumeMounts and "securityContext: privileged: true". # And also with various volumeMounts and "securityContext: privileged: true".
$apiserver_address = ${kube_env}['KUBERNETES_MASTER_NAME'] $apiserver_address = ${kube_env}['KUBERNETES_MASTER_NAME']
$kubeproxy_args = @(` $default_kubeproxy_args = @(`
"--v=4", "--v=4",
"--master=https://${apiserver_address}", "--master=https://${apiserver_address}",
"--kubeconfig=${env:KUBEPROXY_KUBECONFIG}", "--kubeconfig=${env:KUBEPROXY_KUBECONFIG}",
"--proxy-mode=kernelspace", "--proxy-mode=kernelspace",
"--hostname-override=$(hostname)",
"--cluster-cidr=$(${kube_env}['CLUSTER_IP_RANGE'])", "--cluster-cidr=$(${kube_env}['CLUSTER_IP_RANGE'])",
# Configure kube-proxy to run as a windows service. # Configure kube-proxy to run as a windows service.
@ -960,6 +969,8 @@ function Start-WorkerServices {
# of string delimiters. # of string delimiters.
"--resource-container=" "--resource-container="
) )
$kubeproxy_args = ${default_kubeproxy_args} + ${kubeproxy_args}
Log-Output "Final kubeproxy_args: ${kubeproxy_args}"
# TODO(pjh): kubelet is emitting these messages: # TODO(pjh): kubelet is emitting these messages:
# I1023 23:44:11.761915 2468 kubelet.go:274] Adding pod path: # I1023 23:44:11.761915 2468 kubelet.go:274] Adding pod path: