Update

Author: jgwest

cmd/main.go

@@ -35,7 +35,6 @@ import (
 	argov1alpha1api "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
 	argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	argocdcommon "github.com/argoproj-labs/argocd-operator/common"
-	"github.com/argoproj-labs/argocd-operator/controllers/argocd"
 	argocdprovisioner "github.com/argoproj-labs/argocd-operator/controllers/argocd"
 	notificationsprovisioner "github.com/argoproj-labs/argocd-operator/controllers/notificationsconfiguration"
 	appsv1 "github.com/openshift/api/apps/v1"
@@ -229,8 +228,8 @@ func main() {
 		Scheme:        mgr.GetScheme(),
 		LabelSelector: labelSelectorFlag,
 		K8sClient:     k8sClient,
-		LocalUsers: &argocd.LocalUsersInfo{
-			TokenRenewalTimers: map[string]*argocd.TokenRenewalTimer{},
+		LocalUsers: &argocdprovisioner.LocalUsersInfo{
+			TokenRenewalTimers: map[string]*argocdprovisioner.TokenRenewalTimer{},
 		},
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Argo CD")

controllers/argocd/openshift/openshift.go

@@ -118,7 +118,7 @@ func BuilderHook(_ *argoapp.ArgoCD, v interface{}, _ string) error {
 	logv.Info("updating the Argo CD controller to watch for changes to the admin ClusterRole")
 
 	clusterResourceHandler := handler.EnqueueRequestsFromMapFunc(adminClusterRoleMapper(bldr.Client))
-	bldr.Builder.Watches(&rbacv1.ClusterRole{}, clusterResourceHandler,
+	bldr.Watches(&rbacv1.ClusterRole{}, clusterResourceHandler,
 		builder.WithPredicates(predicate.NewPredicateFuncs(func(o client.Object) bool {
 			return o.GetName() == "admin"
 		})))

controllers/argocd/openshift/openshift_test.go

@@ -306,10 +306,10 @@ func TestAdminClusterRoleMapper(t *testing.T) {
 
 		// Sort both slices to ensure consistent comparison
 		sort.Slice(result, func(i, j int) bool {
-			return result[i].NamespacedName.Name < result[j].NamespacedName.Name
+			return result[i].Name < result[j].Name
 		})
 		sort.Slice(expectedRequests, func(i, j int) bool {
-			return expectedRequests[i].NamespacedName.Name < expectedRequests[j].NamespacedName.Name
+			return expectedRequests[i].Name < expectedRequests[j].Name
 		})
 
 		assert.Equal(t, expectedRequests, result)

test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go

@@ -95,7 +95,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			if os.Getenv("CI") == "prow" {
 				// when running against openshift-ci
 				expected_dexVersion = "v2.30.3-dirty"
-				expected_redisVersion = "6.2.4"
+				expected_redisVersion = "7.2.7"
 
 			} else {
 				// when running against RC/ released version of gitops