From 52b5285f3e5dc54092d596cd80e99b49703de9f0 Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Wed, 9 Apr 2025 05:39:08 -0400 Subject: [PATCH 1/4] Update Signed-off-by: Jonathan West --- DONT-MERGE.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 DONT-MERGE.txt diff --git a/DONT-MERGE.txt b/DONT-MERGE.txt new file mode 100644 index 000000000..e246ee0a2 --- /dev/null +++ b/DONT-MERGE.txt @@ -0,0 +1,3 @@ + +Empty commit, don't merge. + From bb45d93230fc7fa714ed4eaa85b001dddf2aac65 Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Wed, 9 Apr 2025 05:40:09 -0400 Subject: [PATCH 2/4] Update --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7e19919aa..09c23db52 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.5 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250314083117-bb5580b286c5 - github.com/argoproj-labs/argocd-operator v0.14.0-rc4 + github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250407060436-d8bd8635e78c github.com/coreos/prometheus-operator v0.40.0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 diff --git a/go.sum b/go.sum index 35234a764..8fb068b89 100644 --- a/go.sum +++ b/go.sum @@ -622,8 +622,8 @@ github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250314083117-bb5580b286c5 h1:w/B/Zn/kuxTqNozZyDxAz2cXp1zC2wr67bU5nkktfNw= github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250314083117-bb5580b286c5/go.mod h1:hX18xfJcnomx/k6urvDp/7+Zwa/y5aF1Mlhz5a2en4k= -github.com/argoproj-labs/argocd-operator v0.14.0-rc4 h1:5jlgfsCrN9e2jRC5Cl7AfCHIuReHyncMAxWdeLbK3/E= -github.com/argoproj-labs/argocd-operator v0.14.0-rc4/go.mod h1:UHe70eXnnCEfzp7EWRofMU+BFnPgZiT5OSqpuInEARA= +github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250407060436-d8bd8635e78c h1:rBpU8LkWMK2d3hMYJOSh7U2yESEKGLnaMKyMH4ML/zE= +github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250407060436-d8bd8635e78c/go.mod h1:UHe70eXnnCEfzp7EWRofMU+BFnPgZiT5OSqpuInEARA= github.com/argoproj/argo-cd/v2 v2.12.3 h1:Bi4QahHTnKl3esU5MplQP1wraGhaTpvgAV4GsMqc3Zc= github.com/argoproj/argo-cd/v2 v2.12.3/go.mod h1:2fh6q4NX/cylbH6Ktx/KjJsX7sOBwF3jbGnO0IZyNOc= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= From 869b651ea141292e6330caf6e7d616a9e826c026 Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Wed, 9 Apr 2025 07:35:54 -0400 Subject: [PATCH 3/4] Update --- .../01-assert.yaml | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-assert.yaml b/test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-assert.yaml index 80327c1e8..179b13c30 100644 --- a/test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-assert.yaml +++ b/test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-assert.yaml @@ -22,6 +22,12 @@ spec: name: argocd-repo-server-tls - mountPath: /app/config/server/tls/redis name: argocd-operator-redis-tls + - mountPath: /home/argocd + name: plugins-home + - mountPath: /home/argocd/params + name: argocd-cmd-params-cm + - mountPath: /tmp + name: tmp volumes: - configMap: defaultMode: 420 @@ -41,6 +47,18 @@ spec: defaultMode: 420 optional: true secretName: argocd-operator-redis-tls + - emptyDir: {} + name: plugins-home + - configMap: + defaultMode: 420 + optional: true + items: + - key: server.profile.enabled + path: profiler.enabled + name: argocd-cmd-params-cm + name: argocd-cmd-params-cm + - emptyDir: {} + name: tmp --- apiVersion: apps/v1 kind: Deployment @@ -112,6 +130,12 @@ spec: name: argocd-repo-server-tls - mountPath: /app/config/controller/tls/redis name: argocd-operator-redis-tls + - mountPath: /home/argocd + name: argocd-home + - mountPath: /home/argocd/params + name: argocd-cmd-params-cm + - mountPath: /tmp + name: argocd-application-controller-tmp volumes: - name: argocd-repo-server-tls secret: @@ -122,4 +146,16 @@ spec: secret: defaultMode: 420 optional: true - secretName: argocd-operator-redis-tls \ No newline at end of file + secretName: argocd-operator-redis-tls + - emptyDir: {} + name: argocd-home + - configMap: + defaultMode: 420 + items: + - key: controller.profile.enabled + path: profiler.enabled + name: argocd-cmd-params-cm + optional: true + name: argocd-cmd-params-cm + - emptyDir: {} + name: argocd-application-controller-tmp \ No newline at end of file From e9517b936893ff245a1c6f78e0434edb68911857 Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Thu, 10 Apr 2025 00:59:20 -0400 Subject: [PATCH 4/4] Update --- .../01-assert.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml b/test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml index f193b327a..270665060 100644 --- a/test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml +++ b/test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml @@ -22,7 +22,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/managed-by: argocd app.kubernetes.io/name: argocd-applicationset-controller - app.kubernetes.io/part-of: argocd-applicationset + app.kubernetes.io/part-of: argocd spec: selector: matchLabels: