misc modifications

Signed-off-by: Raghavi Shirur <rshirur@redhat.com>

Author: raghavi101

common/common.go

@@ -31,9 +31,9 @@ const (
 	DefaultConsoleVersion = "v0.1.0"
 	// Default console plugin installation OCP version
 	DefaultDynamicPluginStartOCPVersion = "4.15.0"
-	// Label Selector is an env variable for ArgoCD instance reconcilliation.
+	// ArgoCDLabelSelector is an env variable used for filtering ArgoCD instances to be reconciled.
 	ArgoCDLabelSelector = "ARGOCD_LABEL_SELECTOR"
-	// Default Label Selector is used when the Label Selector is not mentioned/empty.
+	// DefaultArgoCDLabelSelector is used when the ARGOCD_LABEL_SELECTOR is not specified or is empty.
 	DefaultArgoCDLabelSelector = ""
 )
 

main.go

@@ -185,7 +185,7 @@ func main() {
 	}
 	// Check the label selector format eg. "foo=bar"
 	if _, err := labels.Parse(labelSelectorFlag); err != nil {
-		setupLog.Info("error parsing the labelSelector '%s'.", labelSelectorFlag)
+		setupLog.Error(err, "error parsing the labelSelector '%s'.", labelSelectorFlag)
 		os.Exit(1)
 	}
 	setupLog.Info(fmt.Sprintf("Watching label-selector \"%s\"", labelSelectorFlag))

test/openshift/e2e/sequential/1-105_validate_label_selector/01-add-label-selector.yaml

@@ -3,21 +3,21 @@ kind: TestStep
 commands:
 # patches the subscription to add label selector in argocd-operator
 
-- script: |
-      oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR=foo=bar -c manager
-- script: sleep 30
 # - script: |
-#     if ! [ -z $NON_OLM ]; then
 #       oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR=foo=bar -c manager
+# - script: sleep 30
+- script: |
+    if ! [ -z $NON_OLM ]; then
+      oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR=foo=bar -c manager
       
-#     elif [ -z $CI ]; then 
+    elif [ -z $CI ]; then 
 
-#       oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
-#         --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}'
+      oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
+        --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}'
 
-#     else
+    else
     
-#       oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \
-#         --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}'
-#     fi
-# - script: sleep 120
+      oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \
+        --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}'
+    fi
+- script: sleep 120

test/openshift/e2e/sequential/1-105_validate_label_selector/07-remove-label-selector.yaml

@@ -2,22 +2,22 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
 # patches the subscription to remove label-selector from argocd-operator
-- script: |
-      oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR- -c manager
-- script: sleep 30
-
 # - script: |
-#     if ! [ -z $NON_OLM ]; then
-
 #       oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR- -c manager
+# - script: sleep 30
+
+- script: |
+    if ! [ -z $NON_OLM ]; then
+
+      oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR- -c manager
        
-#     elif [ -z $CI ]; then 
+    elif [ -z $CI ]; then 
 
-#       oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
-#         --type json --patch '[{"op": "remove", "path": "/spec/config"}]'
-#     else
+      oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
+        --type json --patch '[{"op": "remove", "path": "/spec/config"}]'
+    else
     
-#       oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \
-#         --type json --patch '[{"op": "remove", "path": "/spec/config"}]'
-#     fi
-# - script: sleep 120
+      oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \
+        --type json --patch '[{"op": "remove", "path": "/spec/config"}]'
+    fi
+- script: sleep 120