github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #71283 from Klaven/kubeadm_857

Browse Source 
Updates to always pass spec.nodeName as --hostname-override
This commit is contained in:
k8s-ci-robot 2018-11-20 17:31:24 -08:00 committed by GitHub
commit 1431aeb45d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/phases/addons/proxy/manifests.go
View File

@ -80,6 +80,7 @@ spec:
command: command:
- /usr/local/bin/kube-proxy - /usr/local/bin/kube-proxy
- --config=/var/lib/kube-proxy/{{ .ProxyConfigMapKey }} - --config=/var/lib/kube-proxy/{{ .ProxyConfigMapKey }}
- --hostname-override=$(NODE_NAME)
securityContext: securityContext:
privileged: true privileged: true
volumeMounts: volumeMounts:
@ -91,6 +92,11 @@ spec:
- mountPath: /lib/modules - mountPath: /lib/modules
name: lib-modules name: lib-modules
readOnly: true readOnly: true
env:
- name: NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
hostNetwork: true hostNetwork: true
serviceAccountName: kube-proxy serviceAccountName: kube-proxy
volumes: volumes: