Skip to content

For 1.19.0 build, Pull Ginkgo test cases from argocd-operator repo and integrate them into gitops-operator test structure #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Naveena-058 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

For 1.19.0 build, Pull Ginkgo test cases from argocd-operator repo and integrate them into gitops-operator test structure #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.25.0

require (
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765
github.com/argoproj-labs/argocd-image-updater v1.0.0
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260109095501-c05ab1dd9a27
github.com/argoproj/argo-cd/v3 v3.2.3
github.com/argoproj/gitops-engine v0.7.1-0.20251217140045-5baed5604d2d
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765 h1:zVN+W/nQrRB/kB63YcvcCseuiE//sEzNw6Oa8rqiFOs=
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765/go.mod h1:WPyZkNHZjir/OTt8mrRwcUZKe1euHrHPJsRv1Wp/F/0=
github.com/argoproj-labs/argocd-image-updater v1.0.0 h1:43+lBl3RGiwLAastRXZlDvPT5WOKoA3TOb6SIZstGGI=
github.com/argoproj-labs/argocd-image-updater v1.0.0/go.mod h1:PJ+Pb3faVqSzNNs35INUZYtzlaqKvBE2ZgZGdDabJQM=
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260109095501-c05ab1dd9a27 h1:cYVxJYI0icUiQNJWU8DmTbhCvTuKpt2qq5WDv4tNupM=
github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20260109095501-c05ab1dd9a27/go.mod h1:mYgUph18vdAsTAXZ0+APJQP7C2Ot81cKUqLfYm89msI=
github.com/argoproj/argo-cd/v3 v3.2.3 h1:7PLQOVhrs/+C2S9+LfDygibOHyZIytB7oMPdlFt8fio=
Expand Down
27 changes: 9 additions & 18 deletions test/openshift/e2e/ginkgo/fixture/utils/fixtureUtils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,12 @@ import (
"k8s.io/client-go/tools/clientcmd"
"sigs.k8s.io/controller-runtime/pkg/client"

argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
argocdv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"

osappsv1 "github.com/openshift/api/apps/v1"
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"

rolloutmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/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"
securityv1 "github.com/openshift/api/security/v1"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
gitopsoperatorv1alpha1 "github.com/redhat-developer/gitops-operator/api/v1alpha1"
admissionv1 "k8s.io/api/admissionregistration/v1"
apps "k8s.io/api/apps/v1"
autoscalingv2 "k8s.io/api/autoscaling/v2"
Expand All @@ -30,6 +23,11 @@ import (
rbacv1 "k8s.io/api/rbac/v1"
crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

imageUpdater "github.com/argoproj-labs/argocd-image-updater/api/v1alpha1"

argov1alpha1api "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"

//lint:ignore ST1001 "This is a common practice in Gomega tests for readability."
. "github.com/onsi/gomega" //nolint:all
)
Expand Down Expand Up @@ -94,14 +92,6 @@ func getKubeClient(config *rest.Config) (client.Client, *runtime.Scheme, error)
return nil, nil, err
}

if err := gitopsoperatorv1alpha1.AddToScheme(scheme); err != nil {
return nil, nil, err
}

if err := olmv1alpha1.AddToScheme(scheme); err != nil {
return nil, nil, err
}

if err := routev1.AddToScheme(scheme); err != nil {
return nil, nil, err
}
Expand All @@ -113,9 +103,6 @@ func getKubeClient(config *rest.Config) (client.Client, *runtime.Scheme, error)
if err := consolev1.AddToScheme(scheme); err != nil {
return nil, nil, err
}
if err := rolloutmanagerv1alpha1.AddToScheme(scheme); err != nil {
return nil, nil, err
}

if err := argov1alpha1api.AddToScheme(scheme); err != nil {
return nil, nil, err
Expand All @@ -137,6 +124,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
Expand Down
11 changes: 6 additions & 5 deletions test/openshift/e2e/ginkgo/parallel/1-042_restricted_pss_compliant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,20 @@ import (
"context"
"strings"

argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
"github.com/google/uuid"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd"
k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s"
fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"

argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd"
k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s"
fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"

"sigs.k8s.io/controller-runtime/pkg/client"
)

Expand Down
Loading