Merge pull request #298 from jcantrill/1768688

Bug 1768688: Enable status for CRDs
openshift · Nov 15, 2019 · c689079 · c689079
2 parents e02c91f + 5405b48
commit c689079
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/hack/undeploy.sh b/hack/undeploy.sh
@@ -2,6 +2,6 @@
 
 source "$(dirname $0)/common"
 
-oc delete ns openshift-logging --force --ignore-not-found --grace-period=0
-oc delete -n openshift is origin-cluster-logging-operator --force --ignore-not-found --grace-period=0
-oc delete -n openshift bc cluster-logging-operator --force --ignore-not-found --grace-period=0
+oc delete ns openshift-logging --force --ignore-not-found --grace-period=0 ||:
+oc delete -n openshift is origin-cluster-logging-operator --force --ignore-not-found --grace-period=0 ||:
+oc delete -n openshift bc cluster-logging-operator --force --ignore-not-found --grace-period=0||:
diff --git a/manifests/4.3/cluster-loggings.crd.yaml b/manifests/4.3/cluster-loggings.crd.yaml
@@ -184,3 +184,5 @@ spec:
                   - schedule
               required:
               - type
+  subresources:
+    status: {}
diff --git a/manifests/4.3/collectors.crd.yaml b/manifests/4.3/collectors.crd.yaml
@@ -42,3 +42,5 @@ spec:
               description: Define which Nodes the Pods are scheduled on.
           required:
           - type
+  subresources:
+    status: {}
diff --git a/manifests/4.3/logforwardings.crd.yaml b/manifests/4.3/logforwardings.crd.yaml
@@ -57,7 +57,7 @@ spec:
                     type: string
                   outputRefs:
                     description: The name of outputs to send the source logs
-                    items: 
+                    items:
                       type: string
                     type: array
                   inputType:
@@ -71,8 +71,10 @@ spec:
               - name
               - source
               - outputRefs
-              type: array    
+              type: array
           required:
           - outputs
           - pipelines
-
+  subresources:
+    status: {}
+
diff --git a/pkg/controller/forwarding/forwarding_controller.go b/pkg/controller/forwarding/forwarding_controller.go
@@ -7,6 +7,7 @@ import (
 	loggingv1 "github.com/openshift/cluster-logging-operator/pkg/apis/logging/v1"
 	logforwarding "github.com/openshift/cluster-logging-operator/pkg/apis/logging/v1alpha1"
 	"github.com/openshift/cluster-logging-operator/pkg/k8shandler"
+	"github.com/openshift/cluster-logging-operator/pkg/logger"
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -76,10 +77,13 @@ var (
 // The Controller will requeue the Request to be processed again if the returned error is non-nil or
 // Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
 func (r *ReconcileForwarding) Reconcile(request reconcile.Request) (reconcile.Result, error) {
+	logger.Debugf("logforwarding-controller Reconciling: %v", request)
 	// Fetch the LogForwarding instance
 	instance := &logforwarding.LogForwarding{}
+	logger.Debug("logforwarding-controller fetching LF instance")
 	err := r.client.Get(context.TODO(), request.NamespacedName, instance)
 	if err != nil {
+		logger.Debugf("logforwarding-controller Error getting instance. It will be retried if other then 'NotFound': %v", err)
 		if errors.IsNotFound(err) {
 			// Request object not found, could have been deleted after reconcile request.
 			// Owned objects are automatically garbage collected. For additional cleanup logic use finalizers.
@@ -89,6 +93,7 @@ func (r *ReconcileForwarding) Reconcile(request reconcile.Request) (reconcile.Re
 		// Error reading the object - requeue the request.
 		return reconcile.Result{}, err
 	}
+	logger.Debugf("logforwarding-controller fetched LF instance: %v", instance)
 
 	//check for instancename and then update status
 	var reconcileErr error = nil
@@ -97,22 +102,28 @@ func (r *ReconcileForwarding) Reconcile(request reconcile.Request) (reconcile.Re
 	} else {
 		instance.Status = logforwarding.NewForwardingStatus(logforwarding.LogForwardingStateAccepted, logforwarding.LogForwardingReasonName, "")
 
+		logger.Debug("logforwarding-controller fetching ClusterLogging instance...")
 		clInstance := &loggingv1.ClusterLogging{}
 		clName := types.NamespacedName{Name: singletonName, Namespace: openshiftNS}
 		err = r.client.Get(context.TODO(), clName, clInstance)
 		if err != nil && !errors.IsNotFound(err) {
 			// Request object not found, could have been deleted after reconcile request.
 			// Owned objects are automatically garbage collected. For additional cleanup logic use finalizers.
 			// Return and don't requeue
+			logger.Debugf("logforwarding-controller error fetching ClusterLogging instance: %v")
 			return reconcile.Result{}, err
 		}
 
+		logger.Debug("logforwarding-controller calling ClusterLogging reconciler...")
 		reconcileErr = k8shandler.Reconcile(clInstance, instance, r.client)
 	}
 
+	logger.Debugf("logforwarding-controller updating status of instance: %v", instance)
 	if err = r.client.Status().Update(context.TODO(), instance); err != nil {
+		logger.Debugf("logforwarding-controller error updating status: %v", err)
 		return reconcile.Result{}, err
 	}
 
+	logger.Debugf("logforwarding-controller returning %v, error: %v", reconcileResult, reconcileErr)
 	return reconcileResult, reconcileErr
 }
diff --git a/pkg/k8shandler/reconciler.go b/pkg/k8shandler/reconciler.go
@@ -10,7 +10,7 @@ import (
 )
 
 func Reconcile(requestCluster *logging.ClusterLogging, forwarding *logforwarding.LogForwarding, requestClient client.Client) (err error) {
-	logger.Debugf("Reconciling %v", requestCluster)
+	logger.Debugf("Reconciling cl: %v, forwarding: %v", requestCluster, forwarding)
 	clusterLoggingRequest := ClusterLoggingRequest{
 		client:            requestClient,
 		cluster:           requestCluster,