Skip to content

Commit ded3662

Browse files
committed
feat: pull Ginkgo test cases from argocd-operator repo
1 parent 3c49188 commit ded3662

9 files changed

+1673
-31
lines changed

go.mod

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

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765
7+
github.com/argoproj-labs/argocd-image-updater v1.0.0
78
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260109095501-c05ab1dd9a27
89
github.com/argoproj/argo-cd/v3 v3.2.3
910
github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
3131
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
3232
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765 h1:zVN+W/nQrRB/kB63YcvcCseuiE//sEzNw6Oa8rqiFOs=
3333
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765/go.mod h1:WPyZkNHZjir/OTt8mrRwcUZKe1euHrHPJsRv1Wp/F/0=
34+
github.com/argoproj-labs/argocd-image-updater v1.0.0 h1:43+lBl3RGiwLAastRXZlDvPT5WOKoA3TOb6SIZstGGI=
35+
github.com/argoproj-labs/argocd-image-updater v1.0.0/go.mod h1:PJ+Pb3faVqSzNNs35INUZYtzlaqKvBE2ZgZGdDabJQM=
3436
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260109095501-c05ab1dd9a27 h1:cYVxJYI0icUiQNJWU8DmTbhCvTuKpt2qq5WDv4tNupM=
3537
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260109095501-c05ab1dd9a27/go.mod h1:mYgUph18vdAsTAXZ0+APJQP7C2Ot81cKUqLfYm89msI=
3638
github.com/argoproj/argo-cd/v3 v3.2.3 h1:7PLQOVhrs/+C2S9+LfDygibOHyZIytB7oMPdlFt8fio=

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

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,12 @@ import (
88
"k8s.io/client-go/tools/clientcmd"
99
"sigs.k8s.io/controller-runtime/pkg/client"
1010

11-
argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
1211
argocdv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
13-
1412
osappsv1 "github.com/openshift/api/apps/v1"
15-
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
16-
17-
rolloutmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
18-
argov1alpha1api "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
1913
consolev1 "github.com/openshift/api/console/v1"
2014
routev1 "github.com/openshift/api/route/v1"
2115
securityv1 "github.com/openshift/api/security/v1"
2216
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
23-
gitopsoperatorv1alpha1 "github.com/redhat-developer/gitops-operator/api/v1alpha1"
2417
admissionv1 "k8s.io/api/admissionregistration/v1"
2518
apps "k8s.io/api/apps/v1"
2619
autoscalingv2 "k8s.io/api/autoscaling/v2"
@@ -30,6 +23,11 @@ import (
3023
rbacv1 "k8s.io/api/rbac/v1"
3124
crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3225

26+
imageUpdater "github.com/argoproj-labs/argocd-image-updater/api/v1alpha1"
27+
28+
argov1alpha1api "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
29+
argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
30+
3331
//lint:ignore ST1001 "This is a common practice in Gomega tests for readability."
3432
. "github.com/onsi/gomega" //nolint:all
3533
)
@@ -94,14 +92,6 @@ func getKubeClient(config *rest.Config) (client.Client, *runtime.Scheme, error)
9492
return nil, nil, err
9593
}
9694

97-
if err := gitopsoperatorv1alpha1.AddToScheme(scheme); err != nil {
98-
return nil, nil, err
99-
}
100-
101-
if err := olmv1alpha1.AddToScheme(scheme); err != nil {
102-
return nil, nil, err
103-
}
104-
10595
if err := routev1.AddToScheme(scheme); err != nil {
10696
return nil, nil, err
10797
}
@@ -113,9 +103,6 @@ func getKubeClient(config *rest.Config) (client.Client, *runtime.Scheme, error)
113103
if err := consolev1.AddToScheme(scheme); err != nil {
114104
return nil, nil, err
115105
}
116-
if err := rolloutmanagerv1alpha1.AddToScheme(scheme); err != nil {
117-
return nil, nil, err
118-
}
119106

120107
if err := argov1alpha1api.AddToScheme(scheme); err != nil {
121108
return nil, nil, err
@@ -137,6 +124,10 @@ func getKubeClient(config *rest.Config) (client.Client, *runtime.Scheme, error)
137124
return nil, nil, err
138125
}
139126

127+
if err := imageUpdater.AddToScheme(scheme); err != nil {
128+
return nil, nil, err
129+
}
130+
140131
k8sClient, err := client.New(config, client.Options{Scheme: scheme})
141132
if err != nil {
142133
return nil, nil, err

test/openshift/e2e/ginkgo/parallel/1-042_restricted_pss_compliant_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@ import (
2020
"context"
2121
"strings"
2222

23-
argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
2423
"github.com/google/uuid"
2524
. "github.com/onsi/ginkgo/v2"
2625
. "github.com/onsi/gomega"
27-
"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
28-
argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd"
29-
k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s"
30-
fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
3126
appsv1 "k8s.io/api/apps/v1"
3227
corev1 "k8s.io/api/core/v1"
3328
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3429
"k8s.io/utils/ptr"
3530

31+
argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
32+
"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
33+
argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd"
34+
k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s"
35+
fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
36+
3637
"sigs.k8s.io/controller-runtime/pkg/client"
3738
)
3839

0 commit comments

Comments
 (0)