render: add --cloud-provider

kubernetes-retired · Nov 3, 2016 · 1709a6f · 1709a6f
1 parent 3326051
commit 1709a6f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/cmd/bootkube/render.go b/cmd/bootkube/render.go
@@ -34,6 +34,7 @@ var (
 		apiServers        string
 		altNames          string
 		selfHostKubelet   bool
+		cloudProvider     string
 	}
 )
 
@@ -46,6 +47,7 @@ func init() {
 	cmdRender.Flags().StringVar(&renderOpts.apiServers, "api-servers", "https://127.0.0.1:443", "List of API server URLs including host:port, commma seprated")
 	cmdRender.Flags().StringVar(&renderOpts.altNames, "api-server-alt-names", "", "List of SANs to use in api-server certificate. Example: 'IP=127.0.0.1,IP=127.0.0.2,DNS=localhost'. If empty, SANs will be extracted from the --api-servers flag.")
 	cmdRender.Flags().BoolVar(&renderOpts.selfHostKubelet, "self-host-kubelet", false, "Create a self-hosted kubelet daemonset.")
+	cmdRender.Flags().StringVar(&renderOpts.cloudProvider, "cloud-provider", "", "The provider for cloud services.  Empty string for no provider")
 }
 
 func runCmdRender(cmd *cobra.Command, args []string) error {
@@ -114,6 +116,7 @@ func flagsToAssetConfig() (c *asset.Config, err error) {
 		APIServers:      apiServers,
 		AltNames:        altNames,
 		SelfHostKubelet: renderOpts.selfHostKubelet,
+		CloudProvider:   renderOpts.cloudProvider,
 	}, nil
 }
 

diff --git a/pkg/asset/asset.go b/pkg/asset/asset.go
@@ -44,6 +44,7 @@ type Config struct {
 	CAPrivKey       *rsa.PrivateKey
 	AltNames        *tlsutil.AltNames
 	SelfHostKubelet bool
+	CloudProvider   string
 }
 
 // NewDefaultAssets returns a list of default assets, optionally

diff --git a/pkg/asset/internal/templates.go b/pkg/asset/internal/templates.go
@@ -51,6 +51,9 @@ 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:
@@ -148,6 +151,9 @@ 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 -}}
         env:
           - name: MY_POD_IP
             valueFrom:
@@ -194,20 +200,29 @@ 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 -}}
         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
 `)
 	SchedulerTemplate = []byte(`apiVersion: extensions/v1beta1
 kind: Deployment

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