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 #20905 from yifan-gu/add_command_in_templates

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-10 07:11:20 -08:00
commit 646cb70fe3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/coreos/kube-manifests/addons/cluster-loadbalancing/glbc/glbc-controller.yaml
View File

@ -63,6 +63,8 @@ spec:
requests: requests:
cpu: 100m cpu: 100m
memory: 50Mi memory: 50Mi
command:
- /glbc
args: args:
- --default-backend-service=kube-system/default-http-backend - --default-backend-service=kube-system/default-http-backend
- --sync-period=300s - --sync-period=300s

8
cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
View File

@ -53,8 +53,9 @@ spec:
requests: requests:
cpu: 100m cpu: 100m
memory: 50Mi memory: 50Mi
command:
- /kube2sky
args: args:
# command = "/kube2sky"
- -domain=${DNS_DOMAIN} - -domain=${DNS_DOMAIN}
- name: skydns - name: skydns
image: gcr.io/google_containers/skydns:2015-10-13-8c72f8c image: gcr.io/google_containers/skydns:2015-10-13-8c72f8c
@ -66,8 +67,9 @@ spec:
requests: requests:
cpu: 100m cpu: 100m
memory: 50Mi memory: 50Mi
command:
- /skydns
args: args:
# command = "/skydns"
- -machines=http://127.0.0.1:4001 - -machines=http://127.0.0.1:4001
- -addr=0.0.0.0:53 - -addr=0.0.0.0:53
- -ns-rotate=false - -ns-rotate=false
@ -103,6 +105,8 @@ spec:
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi
command:
- /exechealthz
args: args:
- -cmd=nslookup kubernetes.default.svc.${DNS_DOMAIN} 127.0.0.1 >/dev/null - -cmd=nslookup kubernetes.default.svc.${DNS_DOMAIN} 127.0.0.1 >/dev/null
- -port=8080 - -port=8080