From 9f2d219331795bc31267d6c42d8a4f7b1af77a08 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Tue, 9 Feb 2016 23:29:43 +0800 Subject: [PATCH] cluster/gce/coreos: Add command in addon templates. As appc spec only has one field for executable path (Exec v.s. ENTRYPOINT + CMD), specifying only args will override the image's original ENTRYPOINT. --- .../cluster-loadbalancing/glbc/glbc-controller.yaml | 2 ++ .../gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cluster/gce/coreos/kube-manifests/addons/cluster-loadbalancing/glbc/glbc-controller.yaml b/cluster/gce/coreos/kube-manifests/addons/cluster-loadbalancing/glbc/glbc-controller.yaml index 4b9b7bbf4b9..390225822b1 100644 --- a/cluster/gce/coreos/kube-manifests/addons/cluster-loadbalancing/glbc/glbc-controller.yaml +++ b/cluster/gce/coreos/kube-manifests/addons/cluster-loadbalancing/glbc/glbc-controller.yaml @@ -63,6 +63,8 @@ spec: requests: cpu: 100m memory: 50Mi + command: + - /glbc args: - --default-backend-service=kube-system/default-http-backend - --sync-period=300s \ No newline at end of file diff --git a/cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml b/cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml index 5cf57c1162f..b291b95ed3e 100644 --- a/cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml +++ b/cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml @@ -53,8 +53,9 @@ spec: requests: cpu: 100m memory: 50Mi + command: + - /kube2sky args: - # command = "/kube2sky" - -domain=${DNS_DOMAIN} - name: skydns image: gcr.io/google_containers/skydns:2015-10-13-8c72f8c @@ -66,8 +67,9 @@ spec: requests: cpu: 100m memory: 50Mi + command: + - /skydns args: - # command = "/skydns" - -machines=http://127.0.0.1:4001 - -addr=0.0.0.0:53 - -ns-rotate=false @@ -103,6 +105,8 @@ spec: requests: cpu: 10m memory: 20Mi + command: + - /exechealthz args: - -cmd=nslookup kubernetes.default.svc.${DNS_DOMAIN} 127.0.0.1 >/dev/null - -port=8080