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

Merge pull request #80566 from BenTheElder/fix-image-ref

Browse Source 
fix kube-proxy manifest
This commit is contained in:
Kubernetes Prow Robot 2019-07-25 22:36:36 -07:00 committed by GitHub
commit 96594b6723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/kube-proxy/kube-proxy-ds.yaml
View File

@ -35,7 +35,7 @@ spec:
effect: "NoSchedule" effect: "NoSchedule"
containers: containers:
- name: kube-proxy - name: kube-proxy
image: {{pillar['kube_docker_registry']}}/kube-proxy:{{pillar['kube-proxy_docker_tag']}} image: {{pillar['kube_docker_registry']}}/kube-proxy-amd64:{{pillar['kube-proxy_docker_tag']}}
resources: resources:
requests: requests:
cpu: {{ cpurequest }} cpu: {{ cpurequest }}

2
cluster/gce/manifests/kube-proxy.manifest
View File

@ -1,3 +1,5 @@
# Please keep kube-proxy configuration in-sync with:
# cluster/addons/kube-proxy/kube-proxy-ds.yaml
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata: