Skip to content

Draft: E2E experiment, don't merge #669

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.

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions DONT-MERGE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

Empty commit, don't merge.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -122,4 +146,16 @@ spec:
secret:
defaultMode: 420
optional: true
secretName: argocd-operator-redis-tls
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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading