Fix UT

vmware-tanzu · Apr 29, 2022 · 6bea2be · 6bea2be
1 parent c15e2a5
commit 6bea2be
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/config/crd/bases/vdo.vmware.com_compatibilityconfigs.yaml b/config/crd/bases/vdo.vmware.com_compatibilityconfigs.yaml
@@ -6,13 +6,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
-  name: compatibilityconfigs.vdo.vmware.com
+  name: compatibilityconfig.vdo.vmware.com
 spec:
   group: vdo.vmware.com
   names:
     kind: CompatibilityConfig
     listKind: CompatibilityConfigList
-    plural: compatibilityconfigs
     singular: compatibilityconfig
   scope: Namespaced
   versions:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -18,4 +18,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: vmware.com/vdo
-  newTag: 0.2.0-1-g5bf9500
+  newTag: 0.2.0-3-ga6b403d
diff --git a/controllers/compatibilityconfig_controller.go b/controllers/compatibilityconfig_controller.go
@@ -42,15 +42,16 @@ type CompatibiltyConfigReconciler struct {
 // +kubebuilder:rbac:groups=vdo.vmware.com,resources=compatibilityconfig,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=vdo.vmware.com,resources=compatibilityconfig/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=vdo.vmware.com,resources=compatibilityconfig/finalizers,verbs=update
-// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
-// +kubebuilder:rbac:groups="",resources=configmaps,verbs=create;get;list;watch;update;patch;delete;
-// +kubebuilder:rbac:groups=*,resources=namespaces,verbs=create;get;list;watch;update;patch;delete;
+// +kubebuilder:rbac:groups="",resources=configmaps,verbs=create;get;list;watch;update;patch;
+// +kubebuilder:rbac:groups=*,resources=namespaces,verbs=get;list;watch;update;patch;
 
 func (r *CompatibiltyConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	logger := r.Logger.WithValues("name", req.Name, "namespace", req.Namespace)
 
 	logger.V(4).Info("processing CompatibilityConfig reconcile")
-
+	if req.NamespacedName.Name != "" || req.Namespace != "" {
+		return ctrl.Result{}, nil
+	}
 	compatibilityConfig := &vdov1alpha1.CompatibilityConfig{}
 	if err := r.Get(ctx, req.NamespacedName, compatibilityConfig); err != nil {
 		logger.Error(err, "Error occurred when fetching CompatibilityConfig resource", "name", req.NamespacedName)