Skip to content

chore: upgrade to latest argocd-operator commit #1004

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

Merged
jgwest merged 1 commit into from
Nov 13, 2025
Merged

chore: upgrade to latest argocd-operator commit #1004

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,022 changes: 741 additions & 281 deletions bundle/manifests/argoproj.io_argocds.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,022 changes: 741 additions & 281 deletions config/crd/bases/argoproj.io_argocds.yaml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.24.6

require (
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251105202113-2a10f87771b9
github.com/argoproj/argo-cd/v3 v3.1.8
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251111193025-5e0aa4e8458c
github.com/argoproj/argo-cd/v3 v3.1.9
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec
github.com/go-logr/logr v1.4.3
github.com/google/go-cmp v0.7.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ 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-operator v0.14.0-rc1.0.20251105202113-2a10f87771b9 h1:v/iZr/sGwdHoqIcdSVZKoXaJ/ivv+2u85OFjyNGLDH0=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251105202113-2a10f87771b9/go.mod h1:ABtgKWsvMlUp6Xys8BVi0CHKdT9ZoFP+rYCqRsY0wvg=
github.com/argoproj/argo-cd/v3 v3.1.8 h1:NkLPiRI5qGkV+q1EN3O7/0Wb9O/MVl62vadKteZqMUw=
github.com/argoproj/argo-cd/v3 v3.1.8/go.mod h1:ZHb/LOz/hr88VWMJiVTd8DGYL7MheHCAT8S6DgYOBFo=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251111193025-5e0aa4e8458c h1:CP/mjwUUVDMy60dy75lrJ/99d/zKA5BIF03GRsFoxOY=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251111193025-5e0aa4e8458c/go.mod h1:pi8DWrcB1D1RZcDRa1Km9oLYnMjCxV8LLvgikss8bn4=
github.com/argoproj/argo-cd/v3 v3.1.9 h1:9P9vJKo1RGWu6mtQnGu61r+0h3XKlA2j3kVhwogUQ/0=
github.com/argoproj/argo-cd/v3 v3.1.9/go.mod h1:ZHb/LOz/hr88VWMJiVTd8DGYL7MheHCAT8S6DgYOBFo=
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec h1:rNAwbRQFvRIuW/e2bU+B10mlzghYXsnwZedYeA7Drz4=
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec/go.mod h1:aIBEG3ohgaC1gh/sw2On6knkSnXkqRLDoBj234Dqczw=
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q=
Expand Down
6 changes: 3 additions & 3 deletions test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,20 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
// These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
expected_kustomizeVersion := "v5.7.0"
expected_helmVersion := "v3.18.4"
expected_argocdVersion := "v3.1.1"
expected_argocdVersion := "v3.1.9"

var expected_dexVersion string
var expected_redisVersion string

if os.Getenv("CI") == "prow" {
// when running against openshift-ci
expected_dexVersion = "v2.43.0"
expected_redisVersion = "7.2.7"
expected_redisVersion = "7.2.11"

} else {
// when running against RC/ released version of gitops
expected_dexVersion = "v2.41.1"
expected_redisVersion = "7.2.7"
expected_redisVersion = "7.2.11"
}

By("locating pods containing toolchain in openshift-gitops")
Expand Down
22 changes: 14 additions & 8 deletions test/openshift/e2e/ginkgo/sequential/1-105_validate_label_selector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
Context("1-105_validate_label_selector", func() {

var (
ctx context.Context
k8sClient client.Client
ctx context.Context
k8sClient client.Client
ns *corev1.Namespace
cleanupFunc func()
)

BeforeEach(func() {
Expand All @@ -33,6 +35,14 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
ctx = context.Background()
})

AfterEach(func() {
defer cleanupFunc()

fixture.OutputDebugOnFail(ns)

fixture.RestoreSubcriptionToDefault()
})

It("ensures that ARGOCD_LABEL_SELECTOR controls which ArgoCD CRs are reconciled via operator", func() {

if fixture.EnvLocalRun() {
Expand All @@ -43,13 +53,9 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
By("adding ARGOCD_LABEL_SELECTOR foo=bar to Operator")
fixture.SetEnvInOperatorSubscriptionOrDeployment("ARGOCD_LABEL_SELECTOR", "foo=bar")

defer func() { // Restore subscription to default after test
fixture.RestoreSubcriptionToDefault()
}()

By("creating new namespace-scoped ArgoCD instance in test-argocd")
By("creating new namespace-scoped ArgoCD instance")

ns := fixture.CreateNamespace("test-argocd")
ns, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()

argoCD := &argov1beta1api.ArgoCD{
ObjectMeta: metav1.ObjectMeta{
Expand Down