github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #61311 from k82cn/k8s_61050_1

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Added network-unavailable tolerations when hostNetwork=true.

Signed-off-by: Da K. Ma <klaus1982.cn@gmail.com>

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #61050 

**Release note**:
```release-note
None
```
This commit is contained in:
Kubernetes Submit Queue 2018-03-19 13:20:48 -07:00 committed by GitHub
commit d0f8f41890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
View File

@ -37,6 +37,11 @@ spec:
serviceAccountName: metadata-proxy serviceAccountName: metadata-proxy
hostNetwork: true hostNetwork: true
dnsPolicy: Default dnsPolicy: Default
tolerations:
- operator: "Exists"
effect: "NoExecute"
- operator: "Exists"
effect: "NoSchedule"
containers: containers:
- name: metadata-proxy - name: metadata-proxy
image: k8s.gcr.io/metadata-proxy:v0.1.9 image: k8s.gcr.io/metadata-proxy:v0.1.9