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

Remove user addons when not present

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2020-03-20 20:33:10 +01:00
parent 591088c681
commit d91e7efd2d
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cluster/addons.go
View File

@@ -33,6 +33,8 @@ const (
IngressAddonJobName = "rke-ingress-controller-deploy-job"
MetricsServerAddonJobName = "rke-metrics-addon-deploy-job"
UserAddonJobName = "rke-user-addon-deploy-job"
UserAddonIncludeJobName = "rke-user-includes-addons-deploy-job"
MetricsServerAddonResourceName = "rke-metrics-addon"
NginxIngressAddonAppName = "ingress-nginx"
KubeDNSAddonAppName = "kube-dns"
@@ -156,11 +158,35 @@ func (c *Cluster) deployUserAddOns(ctx context.Context) error {
if err := c.doAddonDeploy(ctx, c.Addons, UserAddonResourceName, false); err != nil {
return err
}
} else {
addonJobExists, err := addons.AddonJobExists(UserAddonJobName, c.LocalKubeConfigPath, c.K8sWrapTransport)
if err != nil {
return nil
}
if addonJobExists {
log.Infof(ctx, "[addons] Removing user addons")
if err := c.doAddonDelete(ctx, UserAddonResourceName, false); err != nil {
return err
}
log.Infof(ctx, "[addons] User addons removed successfully")
}
}
if len(c.AddonsInclude) > 0 {
if err := c.deployAddonsInclude(ctx); err != nil {
return err
}
} else {
addonJobExists, err := addons.AddonJobExists(UserAddonIncludeJobName, c.LocalKubeConfigPath, c.K8sWrapTransport)
if err != nil {
return nil
}
if addonJobExists {
if err := c.doAddonDelete(ctx, UserAddonsIncludeResourceName, false); err != nil {
return err
}
}
}
if c.Addons == "" && len(c.AddonsInclude) == 0 {
log.Infof(ctx, "[addons] no user addons defined")
@@ -469,7 +495,6 @@ func (c *Cluster) doAddonDelete(ctx context.Context, resourceName string, isCrit
if err := k8s.DeleteK8sSystemJob(deleteJob, k8sClient, c.AddonJobTimeout); err != nil {
return err
}
return nil
}