Merge branch 'master' into konflux/mintmaker/master/github.com-openshift-api-digest

Author: olivergondza

bundle/manifests/argocd-image-updater.argoproj.io_imageupdaters.yaml

@@ -180,7 +180,7 @@ metadata:
     capabilities: Deep Insights
     console.openshift.io/plugins: '["gitops-plugin"]'
     containerImage: quay.io/redhat-developer/gitops-operator
-    createdAt: "2026-02-27T08:17:37Z"
+    createdAt: "2026-03-04T06:59:29Z"
     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"
@@ -306,6 +306,11 @@ spec:
       kind: GitopsService
       name: gitopsservices.pipelines.openshift.io
       version: v1alpha1
+    - description: ImageUpdater is the Schema for the imageupdaters API
+      displayName: ImageUpdater
+      kind: ImageUpdater
+      name: imageupdaters.argocd-image-updater.argoproj.io
+      version: v1alpha1
     - kind: NamespaceManagement
       name: namespacemanagements.argoproj.io
       version: v1beta1

bundle/manifests/gitops-operator.clusterserviceversion.yaml

@@ -9,6 +9,7 @@ resources:
 - bases/argoproj.io_argocds.yaml
 - bases/argoproj.io_namespacemanagements.yaml
 - bases/argoproj.io_notificationsconfigurations.yaml
+- bases/argocd-image-updater.argoproj.io_imageupdaters.yaml
 - bases/analysis-run-crd.yaml
 - bases/analysis-template-crd.yaml
 - bases/argoproj.io_rolloutmanagers.yaml

config/crd/bases/argocd-image-updater.argoproj.io_imageupdaters.yaml

@@ -132,6 +132,11 @@ spec:
       kind: RolloutManager
       name: rolloutmanagers.argoproj.io
       version: v1alpha1
+    - description: ImageUpdater is the Schema for the imageupdaters API
+      displayName: ImageUpdater
+      kind: ImageUpdater
+      name: imageupdaters.argocd-image-updater.argoproj.io
+      version: v1alpha1
     - description: GitopsService is the Schema for the gitopsservices API
       displayName: Gitops Service
       kind: GitopsService

config/crd/kustomization.yaml

@@ -4,8 +4,9 @@ go 1.25.5
 
 require (
 	github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67
-	github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260227080902-0433a07294f8
-	github.com/argoproj/argo-cd/v3 v3.3.0
+	github.com/argoproj-labs/argocd-image-updater v1.1.1
+	github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260304133241-fd7fd59a2b0b
+	github.com/argoproj/argo-cd/v3 v3.3.2
 	github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d
 	github.com/go-logr/logr v1.4.3
 	github.com/google/go-cmp v0.7.0
@@ -43,7 +44,6 @@ require (
 	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/ProtonMail/go-crypto v1.1.6 // indirect
-	github.com/argoproj-labs/argocd-image-updater v1.1.1 // indirect
 	github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 // indirect
 	github.com/argoproj/pkg/v2 v2.0.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect

config/manifests/bases/gitops-operator.clusterserviceversion.yaml

@@ -39,10 +39,10 @@ github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aa
 github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67/go.mod h1:WPyZkNHZjir/OTt8mrRwcUZKe1euHrHPJsRv1Wp/F/0=
 github.com/argoproj-labs/argocd-image-updater v1.1.1 h1:7YDaR3WX2NMsDKp0wN7TRaRRHaVHQ94tSybi2P99MGk=
 github.com/argoproj-labs/argocd-image-updater v1.1.1/go.mod h1:gMHiNrGNwNSt4ljf0ykcnmNvXBk/NJ+Z17AnZVe7V7I=
-github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260227080902-0433a07294f8 h1:MZH+YNGfucyny7tX2Fs4aNNQgeOuu9Gi7MtjS3L4R1U=
-github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260227080902-0433a07294f8/go.mod h1:3/Y9YWMU+DHC+onOQVXPAxrNkoBAGZD+UQui9BgJBjY=
-github.com/argoproj/argo-cd/v3 v3.3.0 h1:9UlruTd5cC/MyvorTXgAIblfZTy63MF5FYvvoAaUvwU=
-github.com/argoproj/argo-cd/v3 v3.3.0/go.mod h1:5VAfe0s/a4VY5GmAIFK76FtW6xn7zAcLmaw25bOL/2g=
+github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260304133241-fd7fd59a2b0b h1:HxyuUUBlSPwKWSvLHnCibtR4Yz3Z6qpEm5wSi3a5oIw=
+github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260304133241-fd7fd59a2b0b/go.mod h1:J1/kP2zzXbKU5Austr4Eg3qAilMtRyQX8yu0/ALUzD0=
+github.com/argoproj/argo-cd/v3 v3.3.2 h1:kVHBj5Z0Wm2D6s69l0q6lC/WH5tc4E1peXgEEOPrLLU=
+github.com/argoproj/argo-cd/v3 v3.3.2/go.mod h1:5VAfe0s/a4VY5GmAIFK76FtW6xn7zAcLmaw25bOL/2g=
 github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d h1:iUJYrbSvpV9n8vyl1sBt1GceM60HhHfnHxuzcm5apDg=
 github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d/go.mod h1:PauXVUVcfiTgC+34lDdWzPS101g4NpsUtDAjFBnWf94=
 github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q=

go.mod

@@ -16,6 +16,7 @@ import (
 	olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
 
 	rolloutmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
+	imageUpdater "github.com/argoproj-labs/argocd-image-updater/api/v1alpha1"
 	argov1alpha1api "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
 	consolev1 "github.com/openshift/api/console/v1"
 	routev1 "github.com/openshift/api/route/v1"
@@ -141,6 +142,10 @@ func getKubeClient(config *rest.Config) (client.Client, *runtime.Scheme, error)
 		return nil, nil, err
 	}
 
+	if err := imageUpdater.AddToScheme(scheme); err != nil {
+		return nil, nil, err
+	}
+
 	k8sClient, err := client.New(config, client.Options{Scheme: scheme})
 	if err != nil {
 		return nil, nil, err

go.sum

@@ -85,9 +85,9 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 		It("verifies that toolchain versions have the expected values", func() {
 
 			// These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
-			expected_kustomizeVersion := "v5.8.0"
+			expected_kustomizeVersion := "v5.8.1"
 			expected_helmVersion := "v3.19.4"
-			expected_argocdVersion := "v3.3.0"
+			expected_argocdVersion := "v3.3.2"
 
 			var expected_dexVersion string
 			var expected_redisVersion string

test/openshift/e2e/ginkgo/fixture/utils/fixtureUtils.go

@@ -419,7 +419,7 @@ UVwpFuaKz5vTCD36Gmmy/u8y
 
 				return strings.Contains(out, `{"created":"my-app-3","type":"Directory"}`)
 
-			}, "4m", "5s").Should(BeTrue())
+			}, "5m", "10s").Should(BeTrue(), "Webhook did not receive the expected notification within timeout")
 
 		})