Merge pull request #193 from kubernetes-incubator/s

render: add flag to optionally create self hosted assets

Author: aaronlevy

cmd/bootkube/render.go

@@ -36,6 +36,7 @@ var (
 		selfHostKubelet   bool
 		storageBackend    string
 		cloudProvider     string
+		selfHostedEtcd    bool
 	}
 )
 
@@ -50,6 +51,7 @@ func init() {
 	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")
+	cmdRender.Flags().BoolVar(&renderOpts.selfHostedEtcd, "experimental-self-hosted-etcd", false, "Create self-hosted etcd assets.")
 }
 
 func runCmdRender(cmd *cobra.Command, args []string) error {
@@ -120,6 +122,7 @@ func flagsToAssetConfig() (c *asset.Config, err error) {
 		SelfHostKubelet: renderOpts.selfHostKubelet,
 		StorageBackend:  renderOpts.storageBackend,
 		CloudProvider:   renderOpts.cloudProvider,
+		SelfHostedEtcd:  renderOpts.selfHostedEtcd,
 	}, nil
 }
 

pkg/asset/asset.go

@@ -47,6 +47,7 @@ type Config struct {
 	CAPrivKey       *rsa.PrivateKey
 	AltNames        *tlsutil.AltNames
 	SelfHostKubelet bool
+	SelfHostedEtcd  bool
 	StorageBackend  string
 	CloudProvider   string
 }
@@ -55,7 +56,7 @@ type Config struct {
 // configured via a user provided AssetConfig. Default assets include
 // TLS assets (certs, keys and secrets), and k8s component manifests.
 func NewDefaultAssets(conf Config) (Assets, error) {
-	as := newStaticAssets(conf.SelfHostKubelet)
+	as := newStaticAssets(conf.SelfHostKubelet, conf.SelfHostedEtcd)
 	as = append(as, newDynamicAssets(conf)...)
 
 	// TLS assets

pkg/asset/k8s.go

@@ -17,20 +17,24 @@ const (
 	secretCMName        = "kube-controller-manager"
 )
 
-func newStaticAssets(selfHostKubelet bool) Assets {
+func newStaticAssets(selfHostKubelet, selfHostedEtcd bool) Assets {
 	var noData interface{}
 	assets := Assets{
 		mustCreateAssetFromTemplate(AssetPathScheduler, internal.SchedulerTemplate, noData),
 		mustCreateAssetFromTemplate(AssetPathProxy, internal.ProxyTemplate, noData),
 		mustCreateAssetFromTemplate(AssetPathKubeDNSDeployment, internal.DNSDeploymentTemplate, noData),
 		mustCreateAssetFromTemplate(AssetPathKubeDNSSvc, internal.DNSSvcTemplate, noData),
 		mustCreateAssetFromTemplate(AssetPathCheckpointer, internal.CheckpointerTemplate, noData),
-		mustCreateAssetFromTemplate(AssetPathEtcdOperator, internal.EtcdOperatorTemplate, noData),
-		mustCreateAssetFromTemplate(AssetPathEtcdSvc, internal.EtcdSvcTemplate, noData),
 	}
 	if selfHostKubelet {
 		assets = append(assets, mustCreateAssetFromTemplate(AssetPathKubelet, internal.KubeletTemplate, noData))
 	}
+	if selfHostedEtcd {
+		assets = append(assets,
+			mustCreateAssetFromTemplate(AssetPathEtcdOperator, internal.EtcdOperatorTemplate, noData),
+			mustCreateAssetFromTemplate(AssetPathEtcdSvc, internal.EtcdSvcTemplate, noData),
+		)
+	}
 
 	return assets
 }