Skip to content

Commit 7de86a7

Browse files
Naveena-058nas438
andauthored
Pull Ginkgo test cases from argocd-operator repo (#1058)
* Pull Ginkgo test cases from argocd-operator repo Signed-off-by: NAVEENA S <nas@redhat.com> * fixing the failed tests Signed-off-by: NAVEENA S <nas@redhat.com> * fixing the failed tests Signed-off-by: NAVEENA S <nas@redhat.com> * Address the comments Signed-off-by: NAVEENA S <nas@redhat.com> * fix: increase timeout for image updater test and add debug output Signed-off-by: NAVEENA S <nas@redhat.com> * fix: increase timeout for image updater test and add debug output Signed-off-by: NAVEENA S <nas@redhat.com> * Add command to check the deployments Signed-off-by: NAVEENA S <nas@redhat.com> * Add ImageUpdater CRD Signed-off-by: NAVEENA S <nas@redhat.com> * Remove debug lines added during troubleshooting of image updater test Signed-off-by: NAVEENA S <nas@redhat.com> * chore: regenerate bundle after CRD cleanup Signed-off-by: NAVEENA S <nas@redhat.com> * Update clusterserviceversion.yaml file Signed-off-by: NAVEENA S <nas@redhat.com> --------- Signed-off-by: NAVEENA S <nas@redhat.com> Co-authored-by: NAVEENA S <nas@redhat.com>
1 parent bd83de3 commit 7de86a7

18 files changed

Lines changed: 2421 additions & 126 deletions

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

Lines changed: 556 additions & 0 deletions
Large diffs are not rendered by default.

bundle/manifests/gitops-operator.clusterserviceversion.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ metadata:
180180
capabilities: Deep Insights
181181
console.openshift.io/plugins: '["gitops-plugin"]'
182182
containerImage: quay.io/redhat-developer/gitops-operator
183-
createdAt: "2026-02-27T08:17:37Z"
183+
createdAt: "2026-03-04T06:59:29Z"
184184
description: Enables teams to adopt GitOps principles for managing cluster configurations
185185
and application delivery across hybrid multi-cluster Kubernetes environments.
186186
features.operators.openshift.io/disconnected: "true"
@@ -306,6 +306,11 @@ spec:
306306
kind: GitopsService
307307
name: gitopsservices.pipelines.openshift.io
308308
version: v1alpha1
309+
- description: ImageUpdater is the Schema for the imageupdaters API
310+
displayName: ImageUpdater
311+
kind: ImageUpdater
312+
name: imageupdaters.argocd-image-updater.argoproj.io
313+
version: v1alpha1
309314
- kind: NamespaceManagement
310315
name: namespacemanagements.argoproj.io
311316
version: v1beta1

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

Lines changed: 556 additions & 0 deletions
Large diffs are not rendered by default.

config/crd/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ resources:
99
- bases/argoproj.io_argocds.yaml
1010
- bases/argoproj.io_namespacemanagements.yaml
1111
- bases/argoproj.io_notificationsconfigurations.yaml
12+
- bases/argocd-image-updater.argoproj.io_imageupdaters.yaml
1213
- bases/analysis-run-crd.yaml
1314
- bases/analysis-template-crd.yaml
1415
- bases/argoproj.io_rolloutmanagers.yaml

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@ spec:
132132
kind: RolloutManager
133133
name: rolloutmanagers.argoproj.io
134134
version: v1alpha1
135+
- description: ImageUpdater is the Schema for the imageupdaters API
136+
displayName: ImageUpdater
137+
kind: ImageUpdater
138+
name: imageupdaters.argocd-image-updater.argoproj.io
139+
version: v1alpha1
135140
- description: GitopsService is the Schema for the gitopsservices API
136141
displayName: Gitops Service
137142
kind: GitopsService

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.25.5
44

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.8-0.20260224121037-1824164aac67
7+
github.com/argoproj-labs/argocd-image-updater v1.1.1
78
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260227080902-0433a07294f8
89
github.com/argoproj/argo-cd/v3 v3.3.0
910
github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d
@@ -43,7 +44,6 @@ require (
4344
github.com/Masterminds/semver/v3 v3.4.0 // indirect
4445
github.com/Microsoft/go-winio v0.6.2 // indirect
4546
github.com/ProtonMail/go-crypto v1.1.6 // indirect
46-
github.com/argoproj-labs/argocd-image-updater v1.1.1 // indirect
4747
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 // indirect
4848
github.com/argoproj/pkg/v2 v2.0.1 // indirect
4949
github.com/beorn7/perks v1.0.1 // indirect

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
1717

1818
rolloutmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
19+
imageUpdater "github.com/argoproj-labs/argocd-image-updater/api/v1alpha1"
1920
argov1alpha1api "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
2021
consolev1 "github.com/openshift/api/console/v1"
2122
routev1 "github.com/openshift/api/route/v1"
@@ -141,6 +142,10 @@ func getKubeClient(config *rest.Config) (client.Client, *runtime.Scheme, error)
141142
return nil, nil, err
142143
}
143144

145+
if err := imageUpdater.AddToScheme(scheme); err != nil {
146+
return nil, nil, err
147+
}
148+
144149
k8sClient, err := client.New(config, client.Options{Scheme: scheme})
145150
if err != nil {
146151
return nil, nil, err

test/openshift/e2e/ginkgo/parallel/1-034_validate_webhook_notifications_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ UVwpFuaKz5vTCD36Gmmy/u8y
419419

420420
return strings.Contains(out, `{"created":"my-app-3","type":"Directory"}`)
421421

422-
}, "4m", "5s").Should(BeTrue())
422+
}, "5m", "10s").Should(BeTrue(), "Webhook did not receive the expected notification within timeout")
423423

424424
})
425425

0 commit comments

Comments
 (0)