Skip to content

Commit 0ab572b

Browse files
authored
chore: upgrade to latest argocd-operator commit (#1004)
Signed-off-by: Jonathan West <jonwest@redhat.com>
1 parent 913ab87 commit 0ab572b

File tree

6 files changed

+1505
-579
lines changed

6 files changed

+1505
-579
lines changed

bundle/manifests/argoproj.io_argocds.yaml

Lines changed: 741 additions & 281 deletions
Large diffs are not rendered by default.

config/crd/bases/argoproj.io_argocds.yaml

Lines changed: 741 additions & 281 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.24.6
44

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765
7-
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251105202113-2a10f87771b9
8-
github.com/argoproj/argo-cd/v3 v3.1.8
7+
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251111193025-5e0aa4e8458c
8+
github.com/argoproj/argo-cd/v3 v3.1.9
99
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec
1010
github.com/go-logr/logr v1.4.3
1111
github.com/google/go-cmp v0.7.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ 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-operator v0.14.0-rc1.0.20251105202113-2a10f87771b9 h1:v/iZr/sGwdHoqIcdSVZKoXaJ/ivv+2u85OFjyNGLDH0=
35-
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251105202113-2a10f87771b9/go.mod h1:ABtgKWsvMlUp6Xys8BVi0CHKdT9ZoFP+rYCqRsY0wvg=
36-
github.com/argoproj/argo-cd/v3 v3.1.8 h1:NkLPiRI5qGkV+q1EN3O7/0Wb9O/MVl62vadKteZqMUw=
37-
github.com/argoproj/argo-cd/v3 v3.1.8/go.mod h1:ZHb/LOz/hr88VWMJiVTd8DGYL7MheHCAT8S6DgYOBFo=
34+
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251111193025-5e0aa4e8458c h1:CP/mjwUUVDMy60dy75lrJ/99d/zKA5BIF03GRsFoxOY=
35+
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251111193025-5e0aa4e8458c/go.mod h1:pi8DWrcB1D1RZcDRa1Km9oLYnMjCxV8LLvgikss8bn4=
36+
github.com/argoproj/argo-cd/v3 v3.1.9 h1:9P9vJKo1RGWu6mtQnGu61r+0h3XKlA2j3kVhwogUQ/0=
37+
github.com/argoproj/argo-cd/v3 v3.1.9/go.mod h1:ZHb/LOz/hr88VWMJiVTd8DGYL7MheHCAT8S6DgYOBFo=
3838
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec h1:rNAwbRQFvRIuW/e2bU+B10mlzghYXsnwZedYeA7Drz4=
3939
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec/go.mod h1:aIBEG3ohgaC1gh/sw2On6knkSnXkqRLDoBj234Dqczw=
4040
github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q=

test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,20 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
8787
// These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
8888
expected_kustomizeVersion := "v5.7.0"
8989
expected_helmVersion := "v3.18.4"
90-
expected_argocdVersion := "v3.1.1"
90+
expected_argocdVersion := "v3.1.9"
9191

9292
var expected_dexVersion string
9393
var expected_redisVersion string
9494

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

100100
} else {
101101
// when running against RC/ released version of gitops
102102
expected_dexVersion = "v2.41.1"
103-
expected_redisVersion = "7.2.7"
103+
expected_redisVersion = "7.2.11"
104104
}
105105

106106
By("locating pods containing toolchain in openshift-gitops")

test/openshift/e2e/ginkgo/sequential/1-105_validate_label_selector_test.go

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
2222
Context("1-105_validate_label_selector", func() {
2323

2424
var (
25-
ctx context.Context
26-
k8sClient client.Client
25+
ctx context.Context
26+
k8sClient client.Client
27+
ns *corev1.Namespace
28+
cleanupFunc func()
2729
)
2830

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

38+
AfterEach(func() {
39+
defer cleanupFunc()
40+
41+
fixture.OutputDebugOnFail(ns)
42+
43+
fixture.RestoreSubcriptionToDefault()
44+
})
45+
3646
It("ensures that ARGOCD_LABEL_SELECTOR controls which ArgoCD CRs are reconciled via operator", func() {
3747

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

46-
defer func() { // Restore subscription to default after test
47-
fixture.RestoreSubcriptionToDefault()
48-
}()
49-
50-
By("creating new namespace-scoped ArgoCD instance in test-argocd")
56+
By("creating new namespace-scoped ArgoCD instance")
5157

52-
ns := fixture.CreateNamespace("test-argocd")
58+
ns, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
5359

5460
argoCD := &argov1beta1api.ArgoCD{
5561
ObjectMeta: metav1.ObjectMeta{

0 commit comments

Comments
 (0)