rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-01 15:06:23 +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
Download Patch File Download Diff File Expand all files Collapse all files

21
cluster/cluster.go
View File

@@ -255,11 +255,11 @@ func (c *Cluster) getUniqueHostList() []*hosts.Host {
return uniqHostList
}
func (c *Cluster) DeployAddons(ctx context.Context) error {
if err := c.DeployK8sAddOns(ctx); err != nil {
func (c *Cluster) deployAddons(ctx context.Context) error {
if err := c.deployK8sAddOns(ctx); err != nil {
return err
}
return c.DeployUserAddOns(ctx)
return c.deployUserAddOns(ctx)
}
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")
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)
}