operator-sdk upgrade working

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>

Author: ArangoGutierrez

Makefile

@@ -29,8 +29,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 BUNDLE_IMG ?= controller-bundle:$(VERSION)
 
 # Image URL to use all building/pushing image targets
-IMAGE_BUILD_CMD ?= "docker build"
-IMAGE_PUSH_CMD ?= "docker push"
+IMAGE_BUILD_CMD ?= docker build
+IMAGE_PUSH_CMD ?= docker push
 IMAGE_BUILD_EXTRA_OPTS ?=
 IMAGE_REGISTRY ?= k8s.gcr.io/nfd
 IMAGE_NAME := node-feature-discovery-operator

build/assets/master/0100_service_account.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: nfd-master
+  name: nfd-operator
 

build/assets/master/0200_clusterrole.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: nfd-master
+  name: nfd-operator
 rules:
 - apiGroups:
   - ""
@@ -11,4 +11,4 @@ rules:
   verbs:
   - get
   - patch
-  - update
+  - update 

build/assets/master/0300_clusterrole_binding.yaml

@@ -1,14 +1,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: nfd-master
+  name: nfd-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: nfd-master
+  name: nfd-operator
 subjects:
 - kind: ServiceAccount
-  name: nfd-master
+  name: nfd-operator
   namespace: node-feature-discovery-operator-devel
-userNames:
-- system:serviceaccount:node-feature-discovery-operator:nfd-master
+ 

build/assets/master/0400_master_daemonset.yaml

@@ -13,7 +13,7 @@ spec:
       labels:
         app: nfd-master
     spec:
-      serviceAccount: nfd-master
+      serviceAccount: nfd-operator
       nodeSelector:
         node-role.kubernetes.io/master: ""
       tolerations:

build/assets/worker/0100_service_account.yaml

@@ -28,7 +28,7 @@ spec:
                     operator: Exists
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
-      serviceAccount: nfd-worker
+      serviceAccount: nfd-operator
       readOnlyRootFilesystem: true
       containers:
         - env:

build/assets/worker/0600_worker_configmap.yaml renamed to build/assets/worker/0100_worker_configmap.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/eduardoarango/node-feature-discovery-operator
-  newTag: v0.2.0-9-g3baab694-dirty
+  newTag: sdk

build/assets/worker/0200_role.yaml

@@ -39,8 +39,6 @@ import (
 
 var log = logf.Log.WithName("controller_nodefeaturediscovery")
 
-const finalizer = "foreground-deletion"
-
 var nfd NFD
 
 // NodeFeatureDiscoveryReconciler reconciles a NodeFeatureDiscovery object
@@ -58,10 +56,7 @@ func (r *NodeFeatureDiscoveryReconciler) SetupWithManager(mgr ctrl.Manager) erro
 	// we want to initate reconcile loop only on spec change of the object
 	p := predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
-			if !validateUpdateEvent(&e) {
-				return false
-			}
-			return true
+			return validateUpdateEvent(&e)
 		},
 	}
 
@@ -141,46 +136,6 @@ func (r *NodeFeatureDiscoveryReconciler) Reconcile(ctx context.Context, req ctrl
 		return ctrl.Result{Requeue: true}, err
 	}
 
-	//// Handle managed deletion
-	//if instance.DeletionTimestamp != nil {
-	//	r.Log.Info("Handle managed deletion")
-	//	// delete components
-	//	if err := r.deleteComponents(instance); err != nil {
-	//		klog.Errorf("failed to delete components: %v", err)
-	//		r.Recorder.Eventf(instance, corev1.EventTypeWarning, "Deletion failed", "Failed to delete components: %v", err)
-	//		return reconcile.Result{}, err
-	//	}
-	//	r.Recorder.Eventf(instance, corev1.EventTypeNormal, "Deletion succeeded", "Succeeded to delete all components")
-	//
-	//	if r.isComponentsExist(instance) {
-	//		return reconcile.Result{RequeueAfter: 10 * time.Second}, nil
-	//	}
-	//
-	//	// remove finalizer
-	//	if hasFinalizer(instance, finalizer) {
-	//		controllerutil.RemoveFinalizer(instance, finalizer)
-	//		if err := r.Update(context.TODO(), instance); err != nil {
-	//			klog.Error("Could not remove finalizer after running finalization logic", "error", fmt.Sprintf("%v", err))
-	//			return reconcile.Result{}, err
-	//		}
-	//
-	//		return reconcile.Result{}, nil
-	//	}
-	//}
-	//
-	//// add finalizer
-	//r.Log.Info("add finalizer")
-	//if !hasFinalizer(instance, finalizer) {
-	//	instance.Finalizers = append(instance.Finalizers, finalizer)
-	//	instance.Status.Conditions = r.getProgressingConditions("DeploymentStarting", "Deployment is starting")
-	//	if err := r.Update(context.TODO(), instance); err != nil {
-	//		return reconcile.Result{}, err
-	//	}
-	//
-	//	// we exit reconcile loop because we will have additional update reconcile
-	//	return reconcile.Result{}, nil
-	//}
-
 	// apply components
 	r.Log.Info("Ready to apply components")
 
@@ -199,21 +154,12 @@ func (r *NodeFeatureDiscoveryReconciler) Reconcile(ctx context.Context, req ctrl
 	return ctrl.Result{}, nil
 }
 
-func (r *NodeFeatureDiscoveryReconciler) deleteComponents(cr *nfdv1.NodeFeatureDiscovery) error {
-
-	return nil
-}
-
-func hasFinalizer(cr *nfdv1.NodeFeatureDiscovery, finalizer string) bool {
-	for _, f := range cr.Finalizers {
-		if f == finalizer {
-			return true
-		}
-	}
-	return false
-}
-
-func (r *NodeFeatureDiscoveryReconciler) isComponentsExist(cr *nfdv1.NodeFeatureDiscovery) bool {
-
-	return false
-}
+//func (r *NodeFeatureDiscoveryReconciler) deleteComponents(cr *nfdv1.NodeFeatureDiscovery) error {
+//
+//	return nil
+//}
+//
+//func (r *NodeFeatureDiscoveryReconciler) isComponentsExist(cr *nfdv1.NodeFeatureDiscovery) bool {
+//
+//	return false
+//}

build/assets/worker/0700_worker_daemonset.yaml renamed to build/assets/worker/0200_worker_daemonset.yaml

@@ -70,7 +70,7 @@ func Namespace(n NFD) (ResourceStatus, error) {
 		return NotReady, err
 	}
 
-	logger.Info("Found, skpping update")
+	logger.Info("Found, skipping update")
 
 	return Ready, nil
 }
@@ -104,7 +104,7 @@ func ServiceAccount(n NFD) (ResourceStatus, error) {
 		return NotReady, err
 	}
 
-	logger.Info("Found, skpping update")
+	logger.Info("Found, skipping update")
 
 	return Ready, nil
 }