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. + diff --git a/go.mod b/go.mod index 0e21d31f0..055b88102 100644 --- a/go.mod +++ b/go.mod @@ -221,3 +221,5 @@ replace ( k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.33.1 k8s.io/sample-controller => k8s.io/sample-controller v0.33.1 ) + +replace github.com/argoproj-labs/argocd-operator => github.com/jgwest/argocd-operator v0.0.15-0.20251209161237-786165d7b942 diff --git a/go.sum b/go.sum index 82d3de55b..a1d471dcd 100644 --- a/go.sum +++ b/go.sum @@ -31,8 +31,6 @@ 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.17.0-rc1.0.20251203145554-258914335b86 h1:crfiDUoEdB1wDUZCpo6Q4rQZmEoFqsrS5swvckM3OUw= -github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20251203145554-258914335b86/go.mod h1:JUvpFGuOdBL23437e/IdBsdwUE+69J6LzKQ2Q42ycc0= 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= @@ -205,6 +203,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jgwest/argocd-operator v0.0.15-0.20251209161237-786165d7b942 h1:wX4wrsktdwV5T1NX3tlNtOOsSbRn8f+C9qDDL+sqvD0= +github.com/jgwest/argocd-operator v0.0.15-0.20251209161237-786165d7b942/go.mod h1:JUvpFGuOdBL23437e/IdBsdwUE+69J6LzKQ2Q42ycc0= github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I= github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=