address the PR comments

kubernetes-retired · Nov 18, 2016 · 9c815cc · 9c815cc
1 parent 380d449
commit 9c815cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/pkg/asset/internal/templates.go b/pkg/asset/internal/templates.go
@@ -51,9 +51,6 @@ spec:
         - --kubeconfig=/etc/kubernetes/kubeconfig
         - --require-kubeconfig
         - --lock-file=/var/run/lock/kubelet.lock
-        {{ with .CloudProvider -}}
-        - --cloud-provider={{ . }}
-        {{ end -}}
         env:
           - name: MY_POD_IP
             valueFrom:
@@ -145,9 +142,7 @@ spec:
         - --tls-private-key-file=/etc/kubernetes/secrets/apiserver.key
         - --service-account-key-file=/etc/kubernetes/secrets/service-account.pub
         - --client-ca-file=/etc/kubernetes/secrets/ca.crt
-        {{ with .CloudProvider -}}
-        - --cloud-provider={{ . }}
-        {{ end -}}
+        - --cloud-provider={{ .CloudProvider  }}
         env:
           - name: MY_POD_IP
             valueFrom:
@@ -220,29 +215,23 @@ spec:
         - --root-ca-file=/etc/kubernetes/secrets/ca.crt
         - --service-account-private-key-file=/etc/kubernetes/secrets/service-account.key
         - --leader-elect=true
-        {{ with .CloudProvider -}}
-        - --cloud-provider={{ . }}
-        {{ end -}}
+        - --cloud-provider={{ .CloudProvider  }}
+        - --configure-cloud-routes=false
         volumeMounts:
         - name: secrets
           mountPath: /etc/kubernetes/secrets
           readOnly: true
         - name: ssl-host
           mountPath: /etc/ssl/certs
           readOnly: true
-        - name: resolv-conf
-          mountPath: /etc/resolv.conf
-          readOnly: true
       volumes:
       - name: secrets
         secret:
           secretName: kube-controller-manager
       - name: ssl-host
         hostPath:
           path: /usr/share/ca-certificates
-      - name: resolv-conf
-        hostPath:
-          path: /etc/resolv.conf
+      dnsPolicy: Default # Don't use cluster DNS.
 `)
 	SchedulerTemplate = []byte(`apiVersion: extensions/v1beta1
 kind: Deployment

diff --git a/pkg/asset/k8s.go b/pkg/asset/k8s.go
@@ -40,7 +40,6 @@ func newDynamicAssets(conf Config) Assets {
 	return Assets{
 		mustCreateAssetFromTemplate(AssetPathControllerManager, internal.ControllerManagerTemplate, conf),
 		mustCreateAssetFromTemplate(AssetPathAPIServer, internal.APIServerTemplate, conf),
-		mustCreateAssetFromTemplate(AssetPathKubelet, internal.KubeletTemplate, conf),
 	}
 }