Added OLM scenario for label-selector kuttl tests and some minor changes

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

Author: raghavi101

common/common.go

@@ -32,7 +32,7 @@ const (
 	// Default console plugin installation OCP version
 	DefaultDynamicPluginStartOCPVersion = "4.15.0"
 	// Label Selector is an env variable for ArgoCD instance reconcilliation.
-	LabelSelector = "LABEL_SELECTOR"
+	ArgoCDLabelSelector = "ARGOCD_LABEL_SELECTOR"
 	// Default Label Selector is used when the Label Selector is not mentioned/empty.
 	DefaultLabelSelector = ""
 )

config/default/manager_auth_proxy_patch.yaml

@@ -46,7 +46,6 @@ spec:
         - "--health-probe-bind-address=:8081"
         - "--metrics-bind-address=127.0.0.1:8080"
         - "--leader-elect"
-        - "--label-selector"
       volumes:
         # Secret created by the service CA operator.
         # We assume that the Kubernetes service exposing the application's pods has the

main.go

@@ -29,6 +29,7 @@ import (
 	"go.uber.org/zap/zapcore"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 
@@ -88,7 +89,7 @@ func main() {
 	var labelSelectorFlag string
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
-	flag.StringVar(&labelSelectorFlag, "label-selector", env.StringFromEnv(common.LabelSelector, common.DefaultLabelSelector), "The label selector is used to map to a subset of ArgoCD instances to reconcile")
+	flag.StringVar(&labelSelectorFlag, "label-selector", env.StringFromEnv(common.ArgoCDLabelSelector, common.DefaultLabelSelector), "The label selector is used to map to a subset of ArgoCD instances to reconcile")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")
@@ -182,6 +183,12 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "Argo CD metrics")
 		os.Exit(1)
 	}
+	// Check the label selector format eg. "foo=bar"
+	if _, err := labels.Parse(labelSelectorFlag); err != nil {
+		setupLog.Info("error parsing the labelSelector '%s'.", labelSelectorFlag)
+		os.Exit(1)
+	}
+	setupLog.Info(fmt.Sprintf("Watching label-selector \"%s\"", labelSelectorFlag))
 
 	if err = (&argocdprovisioner.ReconcileArgoCD{
 		Client:        mgr.GetClient(),

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

@@ -3,6 +3,17 @@ 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 10
+    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 
 
+      oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
+        --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}'
+
+    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

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

@@ -3,5 +3,17 @@ 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 10
+    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 
+
+      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