Merge branch 'master' into GITOPS-9592-Local-Admin-UI-test-with-Playwright

Author: trdoyle81

bundle/manifests/argoproj.io_analysisruns.yaml

@@ -263,6 +263,19 @@ spec:
                 description: NamespaceScoped lets you specify if RolloutManager has
                   to watch a namespace or the whole cluster
                 type: boolean
+              networkPolicy:
+                description: |-
+                  NetworkPolicy controls whether the operator should create NetworkPolicy resources.
+                  if empty, the default is to create network policies
+                properties:
+                  enabled:
+                    default: true
+                    description: |-
+                      Enabled defines whether NetworkPolicy resources should be created for this instance.
+                      When enabled, the operator will reconcile NetworkPolicies for components.
+                      When disabled, the operator will remove any previously-created NetworkPolicies.
+                    type: boolean
+                type: object
               nodePlacement:
                 description: NodePlacement defines NodeSelectors and Taints for Rollouts
                   workloads

bundle/manifests/argoproj.io_analysistemplates.yaml

@@ -190,7 +190,7 @@ metadata:
     capabilities: Deep Insights
     console.openshift.io/plugins: '["gitops-plugin"]'
     containerImage: quay.io/redhat-developer/gitops-operator
-    createdAt: "2026-04-24T14:56:46Z"
+    createdAt: "2026-05-27T11:59:10Z"
     description: Enables teams to adopt GitOps principles for managing cluster configurations
       and application delivery across hybrid multi-cluster Kubernetes environments.
     features.operators.openshift.io/disconnected: "true"
@@ -629,6 +629,7 @@ spec:
           - get
           - update
         - apiGroups:
+          - eks.amazonaws.com
           - elbv2.k8s.aws
           resources:
           - targetgroupbindings

bundle/manifests/argoproj.io_clusteranalysistemplates.yaml

@@ -133,7 +133,7 @@ func main() {
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
 	if err := util.InspectCluster(); err != nil {
-		setupLog.Info("unable to inspect cluster")
+		setupLog.Error(err, "unable to inspect cluster")
 	}
 
 	disableHTTP2 := func(c *tls.Config) {
@@ -198,18 +198,52 @@ func main() {
 		client = mgr.GetClient()
 	}
 
-	registerComponentOrExit(mgr, console.AddToScheme)
-	registerComponentOrExit(mgr, routev1.AddToScheme) // Adding the routev1 api
-	registerComponentOrExit(mgr, operatorsv1.AddToScheme)
-	registerComponentOrExit(mgr, operatorsv1alpha1.AddToScheme)
+	// Setup Scheme for OpenShift Console if available (verified by InspectCluster)
+	if util.IsConsoleAPIFound() {
+		registerComponentOrExit(mgr, console.AddToScheme)
+	}
+
+	// Setup Scheme for OpenShift Route if available (verified by InspectCluster)
+	if util.IsRouteAPIFound() {
+		registerComponentOrExit(mgr, routev1.AddToScheme)
+	}
+
+	// Setup Scheme for Prometheus Operator if available (verified by InspectCluster)
+	if util.IsMonitoringAPIFound() {
+		registerComponentOrExit(mgr, monitoringv1.AddToScheme)
+	}
+
+	// Setup Scheme for OLM if available (verified by InspectCluster)
+	if util.IsOLMAPIFound() {
+		registerComponentOrExit(mgr, operatorsv1.AddToScheme)
+		registerComponentOrExit(mgr, operatorsv1alpha1.AddToScheme)
+	}
+
 	registerComponentOrExit(mgr, argov1alpha1api.AddToScheme)
 	registerComponentOrExit(mgr, argov1beta1api.AddToScheme)
-	registerComponentOrExit(mgr, configv1.AddToScheme)
-	registerComponentOrExit(mgr, monitoringv1.AddToScheme)
+
+	// Setup Scheme for OpenShift Config if available
+	if util.IsConfigAPIFound() {
+		registerComponentOrExit(mgr, configv1.AddToScheme)
+	}
+
 	registerComponentOrExit(mgr, rolloutManagerApi.AddToScheme)
-	registerComponentOrExit(mgr, templatev1.AddToScheme)
-	registerComponentOrExit(mgr, appsv1.AddToScheme)
-	registerComponentOrExit(mgr, oauthv1.AddToScheme)
+
+	// Setup Scheme for OpenShift Template if available (verified by InspectCluster)
+	if util.IsTemplateAPIFound() {
+		registerComponentOrExit(mgr, templatev1.AddToScheme)
+	}
+
+	// Setup Scheme for OpenShift Apps if available (verified by InspectCluster)
+	if util.IsAppsAPIFound() {
+		registerComponentOrExit(mgr, appsv1.AddToScheme)
+	}
+
+	// Setup Scheme for OpenShift OAuth if available (verified by InspectCluster)
+	if util.IsOAuthAPIFound() {
+		registerComponentOrExit(mgr, oauthv1.AddToScheme)
+	}
+
 	registerComponentOrExit(mgr, crdv1.AddToScheme)
 
 	// Start webhook only if ENABLE_CONVERSION_WEBHOOK is set
@@ -229,21 +263,30 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&controllers.ReconcileArgoCDRoute{
-		Client: client,
-		Scheme: mgr.GetScheme(),
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "Argo CD route")
-		os.Exit(1)
+	if util.IsRouteAPIFound() {
+		if err = (&controllers.ReconcileArgoCDRoute{
+			Client: client,
+			Scheme: mgr.GetScheme(),
+		}).SetupWithManager(mgr); err != nil {
+			setupLog.Error(err, "unable to create controller", "controller", "Argo CD route")
+			os.Exit(1)
+		}
+	} else {
+		setupLog.Info("Route API not found, skipping ReconcileArgoCDRoute controller setup")
 	}
 
-	if err = (&controllers.ArgoCDMetricsReconciler{
-		Client: client,
-		Scheme: mgr.GetScheme(),
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "Argo CD metrics")
-		os.Exit(1)
+	if util.IsMonitoringAPIFound() {
+		if err = (&controllers.ArgoCDMetricsReconciler{
+			Client: client,
+			Scheme: mgr.GetScheme(),
+		}).SetupWithManager(mgr); err != nil {
+			setupLog.Error(err, "unable to create controller", "controller", "Argo CD metrics")
+			os.Exit(1)
+		}
+	} else {
+		setupLog.Info("Monitoring API not found, skipping Argo CD metrics controller setup")
 	}
+
 	// Check the label selector format eg. "foo=bar"
 	if _, err := labels.Parse(labelSelectorFlag); err != nil {
 		setupLog.Error(err, "error parsing the labelSelector '%s'.", labelSelectorFlag)