Merge pull request #105 from kalbasit/allow-cloud-provider

render: add --cloud-provider
kubernetes-retired · Nov 18, 2016 · cb22058 · cb22058
2 parents f77dbe0 + 4969f4b
commit cb22058
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/cmd/bootkube/render.go b/cmd/bootkube/render.go
@@ -35,6 +35,7 @@ var (
 		altNames          string
 		selfHostKubelet   bool
 		storageBackend    string
+		cloudProvider     string
 	}
 )
 
@@ -48,6 +49,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 {
@@ -117,6 +119,7 @@ func flagsToAssetConfig() (c *asset.Config, err error) {
 		AltNames:        altNames,
 		SelfHostKubelet: renderOpts.selfHostKubelet,
 		StorageBackend:  renderOpts.storageBackend,
+		CloudProvider:   renderOpts.cloudProvider,
 	}, nil
 }
 

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

diff --git a/pkg/asset/internal/templates.go b/pkg/asset/internal/templates.go
@@ -142,6 +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
+        - --cloud-provider={{ .CloudProvider  }}
         env:
           - name: MY_POD_IP
             valueFrom:
@@ -214,6 +215,8 @@ spec:
         - --root-ca-file=/etc/kubernetes/secrets/ca.crt
         - --service-account-private-key-file=/etc/kubernetes/secrets/service-account.key
         - --leader-elect=true
+        - --cloud-provider={{ .CloudProvider  }}
+        - --configure-cloud-routes=false
         volumeMounts:
         - name: secrets
           mountPath: /etc/kubernetes/secrets
@@ -228,6 +231,7 @@ spec:
       - name: ssl-host
         hostPath:
           path: /usr/share/ca-certificates
+      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
@@ -20,7 +20,6 @@ const (
 func newStaticAssets(selfHostKubelet bool) Assets {
 	var noData interface{}
 	assets := Assets{
-		mustCreateAssetFromTemplate(AssetPathControllerManager, internal.ControllerManagerTemplate, noData),
 		mustCreateAssetFromTemplate(AssetPathScheduler, internal.SchedulerTemplate, noData),
 		mustCreateAssetFromTemplate(AssetPathProxy, internal.ProxyTemplate, noData),
 		mustCreateAssetFromTemplate(AssetPathKubeDNSDeployment, internal.DNSDeploymentTemplate, noData),
@@ -38,6 +37,7 @@ func newStaticAssets(selfHostKubelet bool) Assets {
 
 func newDynamicAssets(conf Config) Assets {
 	return Assets{
+		mustCreateAssetFromTemplate(AssetPathControllerManager, internal.ControllerManagerTemplate, conf),
 		mustCreateAssetFromTemplate(AssetPathAPIServer, internal.APIServerTemplate, conf),
 	}
 }