make node-exporter upgrades work

openshift · Mar 26, 2020 · e276c10 · e276c10
1 parent 6acf39c
commit e276c10
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -37,7 +37,6 @@ import (
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
 	v1betaextensions "k8s.io/api/extensions/v1beta1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	extensionsobj "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
@@ -461,7 +460,7 @@ func (c *Client) DeleteThanosRuler(tr *monv1.ThanosRuler) error {
 	return nil
 }
 
-func (c *Client) DeleteDaemonSet(d *v1beta1.DaemonSet) error {
+func (c *Client) DeleteDaemonSet(d *appsv1.DaemonSet) error {
 	orphanDependents := false
 	err := c.kclient.AppsV1().DaemonSets(d.GetNamespace()).Delete(d.GetName(), &metav1.DeleteOptions{OrphanDependents: &orphanDependents})
 	if apierrors.IsNotFound(err) {
@@ -787,7 +786,7 @@ func (c *Client) CreateOrUpdateDaemonSet(ds *appsv1.DaemonSet) error {
 		uErr, ok := err.(*apierrors.StatusError)
 		if ok && uErr.ErrStatus.Code == 422 && uErr.ErrStatus.Reason == metav1.StatusReasonInvalid {
 			// try to delete DaemonSet
-			err = c.CreateDaemonSet(ds)
+			err = c.DeleteDaemonSet(ds)
 			if err != nil {
 				return errors.Wrap(err, "deleting DaemonSet object failed")
 			}