rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-01 23:33:39 +00:00
Code Issues Releases Wiki Activity

rke refactoring - configure cluster method

Browse Source
This commit is contained in:
galal-hussein 2018-02-08 05:13:06 +02:00
parent 9a234ccb4e
commit d99efdc60f
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons.go
View File

@ -22,14 +22,14 @@ type ingressOptions struct {
NodeSelector map[string]string NodeSelector map[string]string
} }
func (c *Cluster) DeployK8sAddOns(ctx context.Context) error { func (c *Cluster) deployK8sAddOns(ctx context.Context) error {
if err := c.deployKubeDNS(ctx); err != nil { if err := c.deployKubeDNS(ctx); err != nil {
return err return err
} }
return c.deployIngress(ctx) return c.deployIngress(ctx)
} }
func (c *Cluster) DeployUserAddOns(ctx context.Context) error { func (c *Cluster) deployUserAddOns(ctx context.Context) error {
log.Infof(ctx, "[addons] Setting up user addons..") log.Infof(ctx, "[addons] Setting up user addons..")
if c.Addons == "" { if c.Addons == "" {
log.Infof(ctx, "[addons] No user addons configured..") log.Infof(ctx, "[addons] No user addons configured..")

21
cluster/cluster.go
View File

@ -255,11 +255,11 @@ func (c *Cluster) getUniqueHostList() []*hosts.Host {
return uniqHostList return uniqHostList
} }
func (c *Cluster) DeployAddons(ctx context.Context) error { func (c *Cluster) deployAddons(ctx context.Context) error {
if err := c.DeployK8sAddOns(ctx); err != nil { if err := c.deployK8sAddOns(ctx); err != nil {
return err return err
} }
return c.DeployUserAddOns(ctx) return c.deployUserAddOns(ctx)
} }
func (c *Cluster) SyncLabelsAndTaints(ctx context.Context) error { func (c *Cluster) SyncLabelsAndTaints(ctx context.Context) error {
@ -297,3 +297,18 @@ func (c *Cluster) PrePullK8sImages(ctx context.Context) error {
log.Infof(ctx, "Kubernetes images pulled successfully") log.Infof(ctx, "Kubernetes images pulled successfully")
return nil return nil
} }
func ConfigureCluster(ctx context.Context, rkeConfig v3.RancherKubernetesEngineConfig, crtBundle map[string]pki.CertificatePKI, clusterFilePath, configDir string) error {
// dialer factories are not needed here since we are not uses docker only k8s jobs
kubeCluster, err := ParseCluster(ctx, &rkeConfig, clusterFilePath, configDir, nil, nil)
if err != nil {
return err
}
kubeCluster.Certificates = crtBundle
err = kubeCluster.deployNetworkPlugin(ctx)
if err != nil {
return err
}
return kubeCluster.deployAddons(ctx)
}

2
cluster/network.go
View File

@ -96,7 +96,7 @@ const (
RBACConfig = "RBACConfig" RBACConfig = "RBACConfig"
) )
func (c *Cluster) DeployNetworkPlugin(ctx context.Context) error { func (c *Cluster) deployNetworkPlugin(ctx context.Context) error {
log.Infof(ctx, "[network] Setting up network plugin: %s", c.Network.Plugin) log.Infof(ctx, "[network] Setting up network plugin: %s", c.Network.Plugin)
switch c.Network.Plugin { switch c.Network.Plugin {
case FlannelNetworkPlugin: case FlannelNetworkPlugin:

7
cmd/up.go
View File

@ -97,17 +97,12 @@ func ClusterUp(
return APIURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err
} }
err = kubeCluster.DeployNetworkPlugin(ctx)
if err != nil {
return APIURL, caCrt, clientCert, clientKey, err
}
err = kubeCluster.SyncLabelsAndTaints(ctx) err = kubeCluster.SyncLabelsAndTaints(ctx)
if err != nil { if err != nil {
return APIURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err
} }
err = kubeCluster.DeployAddons(ctx) err = cluster.ConfigureCluster(ctx, kubeCluster.RancherKubernetesEngineConfig, kubeCluster.Certificates, clusterFilePath, configDir)
if err != nil { if err != nil {
return APIURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err
} }