Merge pull request #867 from flavianmissi/IR-373

IR-373: remove node-ca daemon

Author: openshift-merge-robot

bindata/assets.go

@@ -5,9 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
-	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
 	appsv1informers "k8s.io/client-go/informers/apps/v1"
@@ -122,65 +121,38 @@ func (c *NodeCADaemonController) sync() error {
 		Status: operatorv1.ConditionUnknown,
 	}
 
-	dsObj, err := gen.Get()
+	_, err := gen.Get()
 	if errors.IsNotFound(err) {
-		availableCondition.Status = operatorv1.ConditionFalse
-		availableCondition.Reason = "NotFound"
-		availableCondition.Message = "The daemon set node-ca does not exist"
+		availableCondition.Status = operatorv1.ConditionTrue
+		availableCondition.Reason = "AsExpected"
+		availableCondition.Message = "The daemon set node-ca is removed"
 
-		progressingCondition.Status = operatorv1.ConditionTrue
-		progressingCondition.Reason = "NotFound"
-		progressingCondition.Message = "The daemon set node-ca does not exist"
+		progressingCondition.Status = operatorv1.ConditionFalse
+		progressingCondition.Reason = "AsExpected"
+		progressingCondition.Message = "The daemon set node-ca is removed"
 	} else if err != nil {
 		availableCondition.Reason = "Unknown"
-		availableCondition.Message = fmt.Sprintf("Unable to check daemon set availability: %s", err)
+		availableCondition.Message = fmt.Sprintf("Unable to check daemon set existence: %s", err)
 
 		progressingCondition.Reason = "Unknown"
-		progressingCondition.Message = fmt.Sprintf("Unable to check daemon set progress: %s", err)
+		progressingCondition.Message = fmt.Sprintf("Unable to check daemon set existence: %s", err)
 	} else {
-		ds := dsObj.(*appsv1.DaemonSet)
-		if ds.Status.NumberAvailable > 0 {
-			availableCondition.Status = operatorv1.ConditionTrue
-			availableCondition.Reason = "AsExpected"
-			availableCondition.Message = "The daemon set node-ca has available replicas"
-		} else {
-			availableCondition.Status = operatorv1.ConditionFalse
-			availableCondition.Reason = "NoAvailableReplicas"
-			availableCondition.Message = "The daemon set node-ca does not have available replicas"
+		gracePeriod := int64(0)
+		propagationPolicy := metav1.DeletePropagationForeground
+		opts := metav1.DeleteOptions{
+			GracePeriodSeconds: &gracePeriod,
+			PropagationPolicy:  &propagationPolicy,
 		}
+		err := gen.Delete(opts)
+		if err != nil && !errors.IsNotFound(err) {
+			availableCondition.Reason = "Unknown"
+			availableCondition.Message = fmt.Sprintf("Unable to delete daemon set: %s", err)
 
-		if ds.Generation != ds.Status.ObservedGeneration {
-			progressingCondition.Status = operatorv1.ConditionTrue
-			progressingCondition.Reason = "Progressing"
-			progressingCondition.Message = "The daemon set node-ca is updating node pods"
-		} else if ds.Status.NumberUnavailable > 0 {
-			progressingCondition.Status = operatorv1.ConditionTrue
-			progressingCondition.Reason = "Unavailable"
-			progressingCondition.Message = "The daemon set node-ca is deploying node pods"
-		} else {
-			progressingCondition.Status = operatorv1.ConditionFalse
-			progressingCondition.Reason = "AsExpected"
-			progressingCondition.Message = "The daemon set node-ca is deployed"
+			progressingCondition.Reason = "Unknown"
+			progressingCondition.Message = fmt.Sprintf("Unable to delete daemon set: %s", err)
 		}
 	}
 
-	err = resource.ApplyMutator(gen)
-	if err != nil {
-		_, _, updateError := v1helpers.UpdateStatus(
-			ctx,
-			c.operatorClient,
-			v1helpers.UpdateConditionFn(availableCondition),
-			v1helpers.UpdateConditionFn(progressingCondition),
-			v1helpers.UpdateConditionFn(operatorv1.OperatorCondition{
-				Type:    "NodeCADaemonControllerDegraded",
-				Status:  operatorv1.ConditionTrue,
-				Reason:  "Error",
-				Message: err.Error(),
-			}),
-		)
-		return utilerrors.NewAggregate([]error{err, updateError})
-	}
-
 	_, _, err = v1helpers.UpdateStatus(
 		ctx,
 		c.operatorClient,

bindata/nodecadaemon.yaml

@@ -2,7 +2,6 @@ package resource
 
 import (
 	"context"
-	"os"
 
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -11,14 +10,9 @@ import (
 	appsv1listers "k8s.io/client-go/listers/apps/v1"
 	corev1listers "k8s.io/client-go/listers/core/v1"
 
-	operatorv1 "github.com/openshift/api/operator/v1"
 	"github.com/openshift/library-go/pkg/operator/events"
-	"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
-	"github.com/openshift/library-go/pkg/operator/resource/resourcemerge"
-	"github.com/openshift/library-go/pkg/operator/resource/resourceread"
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
 
-	assets "github.com/openshift/cluster-image-registry-operator/bindata"
 	"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
 )
 
@@ -58,52 +52,12 @@ func (ds *generatorNodeCADaemonSet) Get() (runtime.Object, error) {
 	return ds.daemonSetLister.Get(ds.GetName())
 }
 
-func (ds *generatorNodeCADaemonSet) expected() *appsv1.DaemonSet {
-	daemonSet := resourceread.ReadDaemonSetV1OrDie(assets.MustAsset("nodecadaemon.yaml"))
-	daemonSet.Spec.Template.Spec.Containers[0].Image = os.Getenv("IMAGE")
-	return daemonSet
-}
-
 func (ds *generatorNodeCADaemonSet) Create() (runtime.Object, error) {
-	dep, _, err := ds.Update(nil)
-	return dep, err
+	return nil, nil
 }
 
 func (ds *generatorNodeCADaemonSet) Update(o runtime.Object) (runtime.Object, bool, error) {
-	desiredDaemonSet := ds.expected()
-
-	_, opStatus, _, err := ds.operatorClient.GetOperatorState()
-	if err != nil {
-		return nil, false, err
-	}
-	actualDaemonSet, updated, err := resourceapply.ApplyDaemonSet(
-		context.TODO(),
-		ds.client,
-		ds.eventRecorder,
-		desiredDaemonSet,
-		resourcemerge.ExpectedDaemonSetGeneration(desiredDaemonSet, opStatus.Generations),
-	)
-	if err != nil {
-		return o, updated, err
-	}
-
-	if updated {
-		updateStatusFn := func(newStatus *operatorv1.OperatorStatus) error {
-			resourcemerge.SetDaemonSetGeneration(&newStatus.Generations, actualDaemonSet)
-			return nil
-		}
-
-		_, _, err = v1helpers.UpdateStatus(
-			context.TODO(),
-			ds.operatorClient,
-			updateStatusFn,
-		)
-		if err != nil {
-			return actualDaemonSet, updated, err
-		}
-	}
-
-	return actualDaemonSet, updated, nil
+	return nil, false, nil
 }
 
 func (ds *generatorNodeCADaemonSet) Delete(opts metav1.DeleteOptions) error {

pkg/operator/nodecadaemon.go

@@ -78,7 +78,6 @@ func TestAWSDefaults(t *testing.T) {
 	framework.EnsureClusterOperatorStatusIsNormal(te)
 	framework.EnsureOperatorIsNotHotLooping(te)
 	framework.EnsureServiceCAConfigMap(te)
-	framework.EnsureNodeCADaemonSetIsAvailable(te)
 
 	s3Driver := storages3.NewDriver(context.Background(), nil, &mockLister.StorageListers)
 	err = s3Driver.UpdateEffectiveConfig()