Use reconcile option for rolling update

kubernetes · Oct 6, 2020 · a04ad19 · a04ad19
1 parent 919a837
commit a04ad19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/instancegroups/instancegroups.go b/pkg/instancegroups/instancegroups.go
@@ -387,7 +387,8 @@ func (c *RollingUpdateCluster) drainTerminateAndWait(u *cloudinstances.CloudInst
 }
 
 func (c *RollingUpdateCluster) reconcileInstanceGroup() error {
-	if api.CloudProviderID(c.Cluster.Spec.CloudProvider) != api.CloudProviderOpenstack {
+	if api.CloudProviderID(c.Cluster.Spec.CloudProvider) != api.CloudProviderOpenstack ||
+		api.CloudProviderID(c.Cluster.Spec.CloudProvider) != api.CloudProviderDO {
 		return nil
 	}
 	rto := fi.RunTasksOptions{}

diff --git a/pkg/resources/digitalocean/cloud.go b/pkg/resources/digitalocean/cloud.go
@@ -107,7 +107,6 @@ func (c *Cloud) DeleteGroup(g *cloudinstances.CloudInstanceGroup) error {
 }
 
 func (c *Cloud) DeleteInstance(i *cloudinstances.CloudInstance) error {
-	klog.Warning("This does not work without running kops update cluster --yes in another terminal")
 	dropletID, err := strconv.Atoi(i.ID)
 	if err != nil {
 		return fmt.Errorf("failed to convert droplet ID to int: %s", err)