fix: Populate destination name when destination server is specified #21063

adriananeci · 2024-12-04T21:10:59Z

Currently, if the destination is specified via server and not name, sync windows cannot target a cluster by its name even if support for it was added via #7817. That is because the destination name is not populated when using the server setting.

Checklist:

bunnyshell · 2024-12-04T21:11:08Z

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

🚀 /bns:deploy to deploy the environment

util/argo/argo.go

codecov · 2024-12-09T23:29:15Z

Codecov Report

Attention: Patch coverage is 60.86957% with 27 lines in your changes missing coverage. Please review.

Project coverage is 55.22%. Comparing base (2f51067) to head (94b9247).
Report is 15 commits behind head on master.

Files with missing lines	Patch %	Lines
applicationset/utils/clusterUtils.go	57.14%	6 Missing and 3 partials ⚠️
util/argo/argo.go	65.38%	6 Missing and 3 partials ⚠️
server/application/application.go	0.00%	5 Missing ⚠️
pkg/apis/application/v1alpha1/types.go	76.47%	3 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #21063      +/-   ##
==========================================
+ Coverage   55.20%   55.22%   +0.02%     
==========================================
  Files         324      324              
  Lines       55596    55658      +62     
==========================================
+ Hits        30689    30738      +49     
- Misses      22285    22288       +3     
- Partials     2622     2632      +10

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

applicationset/utils/clusterUtils.go

server/application/application.go

Signed-off-by: Adrian Aneci <aneci@adobe.com>

gdsoumya · 2024-12-14T05:13:35Z

/cherry-pick release-2.13

gcp-cherry-pick-bot · 2024-12-14T05:13:41Z

Cherry-pick failed with Merge error 030a7be7e2fd0ae976c9b73196d777ea72bada09 into temp-cherry-pick-cc74e0-release-2.13

gdsoumya · 2024-12-14T05:13:43Z

/cherry-pick release-2.12

gcp-cherry-pick-bot · 2024-12-14T05:13:49Z

Cherry-pick failed with Merge error 030a7be7e2fd0ae976c9b73196d777ea72bada09 into temp-cherry-pick-cc74e0-release-2.12

gdsoumya · 2024-12-14T05:13:58Z

/cherry-pick release-2.11

gcp-cherry-pick-bot · 2024-12-14T05:14:06Z

Cherry-pick failed with Merge error 030a7be7e2fd0ae976c9b73196d777ea72bada09 into temp-cherry-pick-cc74e0-release-2.11

gdsoumya · 2024-12-14T05:15:46Z

@adriananeci the cherry pick bot seems to fail cherry picking this pr into the release branches. Can you raise separate PRs to cherry pick this change into the relevant branches?

…rgoproj#21063) * Populate destination name when destination server is specified Signed-off-by: Adrian Aneci <aneci@adobe.com> --------- Signed-off-by: Adrian Aneci <aneci@adobe.com>

adriananeci · 2024-12-14T08:13:02Z

Raised #21176 for cherry picking it into 2.13 release branch

…rgoproj#21063) * Populate destination name when destination server is specified Signed-off-by: Adrian Aneci <aneci@adobe.com> --------- Signed-off-by: Adrian Aneci <aneci@adobe.com>

…21063) (cherry-pick 2.13) (#21176) * fix: Populate destination name when destination server is specified (#21063) * Populate destination name when destination server is specified Signed-off-by: Adrian Aneci <aneci@adobe.com> --------- Signed-off-by: Adrian Aneci <aneci@adobe.com> * Go lint fixes Signed-off-by: Adrian Aneci <aneci@adobe.com> --------- Signed-off-by: Adrian Aneci <aneci@adobe.com>

crenshaw-dev · 2024-12-14T18:43:53Z

Looks like this might have introduced a race condition: https://github.com/argoproj/argo-cd/actions/runs/12327129773/job/34408870839

adriananeci · 2024-12-14T20:00:22Z

Hmm, if there is a race condition I think it should have been there for SetInferredServer method too. Maybe there weren't enough tests to validate it until now?

crenshaw-dev · 2024-12-14T20:21:10Z

The failure is on an old test, TestMaxPodLogsRender:

=== Failed
=== FAIL: server/application TestMaxPodLogsRender/PodLogs#02 (0.25s)
time="2024-12-14T05:21:17Z" level=info msg="Starting configmap/secret informers"
time="2024-12-14T05:21:17Z" level=info msg="Configmap/secret informer synced"
==================
WARNING: DATA RACE
Write at 0x00c007c8a138 by goroutine 3293:
  github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.(*ApplicationDestination).SetInferredName()
      /home/runner/work/argo-cd/argo-cd/pkg/apis/application/v1alpha1/types.go:3335 +0x584
  github.com/argoproj/argo-cd/v2/util/argo.ValidateDestination()
      /home/runner/work/argo-cd/argo-cd/util/argo/argo.go:522 +0x55f
  github.com/argoproj/argo-cd/v2/server/application.(*Server).getApplicationClusterConfig()
      /home/runner/work/argo-cd/argo-cd/server/application/application.go:1303 +0xfc
  github.com/argoproj/argo-cd/v2/server/application.(*Server).PodLogs()
      /home/runner/work/argo-cd/argo-cd/server/application/application.go:1740 +0x1170
  github.com/argoproj/argo-cd/v2/server/application.TestMaxPodLogsRender.func3()
      /home/runner/work/argo-cd/argo-cd/server/application/application_test.go:2217 +0x1bb
  testing.tRunner()
      /opt/hostedtoolcache/go/1.23.3/x64/src/testing/testing.go:1690 +0x226
  testing.(*T).Run.gowrap1()
      /opt/hostedtoolcache/go/1.23.3/x64/src/testing/testing.go:1743 +0x44

Previous read at 0x00c007c8a138 by goroutine 3291:
  github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.(*ApplicationDestination).String()
      /home/runner/work/argo-cd/argo-cd/pkg/apis/application/v1alpha1/generated.pb.go:18720 +0x184
  github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.(*ApplicationSpec).String()
      /home/runner/work/argo-cd/argo-cd/pkg/apis/application/v1alpha1/generated.pb.go:19268 +0x572
  github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.(*Application).String()
      /home/runner/work/argo-cd/argo-cd/pkg/apis/application/v1alpha1/generated.pb.go:18694 +0x11a
  github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.(*Application).String()
      /home/runner/work/argo-cd/argo-cd/pkg/apis/application/v1alpha1/generated.pb.go:18693 +0xb9
  fmt.(*pp).handleMethods()
      /opt/hostedtoolcache/go/1.23.3/x64/src/fmt/print.go:673 +0x6ea
  fmt.(*pp).printArg()
      /opt/hostedtoolcache/go/1.23.3/x64/src/fmt/print.go:756 +0xb4b
  fmt.(*pp).doPrintf()
      /opt/hostedtoolcache/go/1.23.3/x64/src/fmt/print.go:1173 +0x10ce
  fmt.Sprintf()
      /opt/hostedtoolcache/go/1.23.3/x64/src/fmt/print.go:239 +0x5c
  github.com/stretchr/testify/mock.Arguments.Diff()
      /home/runner/go/pkg/mod/github.com/stretchr/testify@v1.10.0/mock/mock.go:965 +0x1ac
  github.com/stretchr/testify/mock.(*Mock).findExpectedCall()
      /home/runner/go/pkg/mod/github.com/stretchr/testify@v1.10.0/mock/mock.go:383 +0x147
  github.com/stretchr/testify/mock.(*Mock).MethodCalled()
      /home/runner/go/pkg/mod/github.com/stretchr/testify@v1.10.0/mock/mock.go:491 +0xac
  github.com/stretchr/testify/mock.(*Mock).Called()
      /home/runner/go/pkg/mod/github.com/stretchr/testify@v1.10.0/mock/mock.go:481 +0x195
  github.com/argoproj/argo-cd/v2/server/application/mocks.(*Broadcaster).OnAdd()
      /home/runner/work/argo-cd/argo-cd/server/application/mocks/Broadcaster.go:17 +0x136
  k8s.io/client-go/tools/cache.(*processorListener).run.func1()
      /home/runner/go/pkg/mod/k8s.io/client-go@v0.31.0/tools/cache/shared_informer.go:978 +0x287
  k8s.io/apimachinery/pkg/util/wait.BackoffUntil.func1()
      /home/runner/go/pkg/mod/k8s.io/apimachinery@v0.31.2/pkg/util/wait/backoff.go:226 +0x41
  k8s.io/apimachinery/pkg/util/wait.BackoffUntil()
      /home/runner/go/pkg/mod/k8s.io/apimachinery@v0.31.2/pkg/util/wait/backoff.go:227 +0xc4
  k8s.io/apimachinery/pkg/util/wait.JitterUntil()
      /home/runner/go/pkg/mod/k8s.io/apimachinery@v0.31.2/pkg/util/wait/backoff.go:204 +0x10a
  k8s.io/apimachinery/pkg/util/wait.Until()
      /home/runner/go/pkg/mod/k8s.io/apimachinery@v0.31.2/pkg/util/wait/backoff.go:161 +0x9b
  k8s.io/client-go/tools/cache.(*processorListener).run()
      /home/runner/go/pkg/mod/k8s.io/client-go@v0.31.0/tools/cache/shared_informer.go:972 +0x38
  k8s.io/client-go/tools/cache.(*processorListener).run-fm()
      <autogenerated>:1 +0x33
  k8s.io/apimachinery/pkg/util/wait.(*Group).Start.func1()
      /home/runner/go/pkg/mod/k8s.io/apimachinery@v0.31.2/pkg/util/wait/wait.go:72 +0x86

Goroutine 3293 (running) created at:
  testing.(*T).Run()
      /opt/hostedtoolcache/go/1.23.3/x64/src/testing/testing.go:1743 +0x825
  github.com/argoproj/argo-cd/v2/server/application.TestMaxPodLogsRender()
      /home/runner/work/argo-cd/argo-cd/server/application/application_test.go:2216 +0x4d5
  testing.tRunner()
      /opt/hostedtoolcache/go/1.23.3/x64/src/testing/testing.go:1690 +0x226
  testing.(*T).Run.gowrap1()
      /opt/hostedtoolcache/go/1.23.3/x64/src/testing/testing.go:1743 +0x44

Goroutine 3291 (running) created at:
  k8s.io/apimachinery/pkg/util/wait.(*Group).Start()
      /home/runner/go/pkg/mod/k8s.io/apimachinery@v0.31.2/pkg/util/wait/wait.go:70 +0xe4
  k8s.io/client-go/tools/cache.(*sharedProcessor).addListener()
      /home/runner/go/pkg/mod/k8s.io/client-go@v0.31.0/tools/cache/shared_informer.go:748 +0x224
  k8s.io/client-go/tools/cache.(*sharedIndexInformer).AddEventHandlerWithResyncPeriod()
      /home/runner/go/pkg/mod/k8s.io/client-go@v0.31.0/tools/cache/shared_informer.go:623 +0x770
  k8s.io/client-go/tools/cache.(*sharedIndexInformer).AddEventHandler()
      /home/runner/go/pkg/mod/k8s.io/client-go@v0.31.0/tools/cache/shared_informer.go:561 +0x51
  github.com/argoproj/argo-cd/v2/server/application.NewServer()
      /home/runner/work/argo-cd/argo-cd/server/application/application.go:120 +0x1a5
  github.com/argoproj/argo-cd/v2/server/application.newTestAppServerWithEnforcerConfigure()
      /home/runner/work/argo-cd/argo-cd/server/application/application_test.go:297 +0x2b71
  github.com/argoproj/argo-cd/v2/server/application.createAppServerWithMaxLodLogs()
      /home/runner/work/argo-cd/argo-cd/server/application/application_test.go:2280 +0x9fd
  github.com/argoproj/argo-cd/v2/server/application.TestMaxPodLogsRender()
      /home/runner/work/argo-cd/argo-cd/server/application/application_test.go:2214 +0x38d
  testing.tRunner()
      /opt/hostedtoolcache/go/1.23.3/x64/src/testing/testing.go:1690 +0x226
  testing.(*T).Run.gowrap1()
      /opt/hostedtoolcache/go/1.23.3/x64/src/testing/testing.go:1743 +0x44
==================
    testing.go:1399: race detected during execution of test

=== FAIL: server/application TestMaxPodLogsRender (3.41s)

adriananeci requested a review from a team as a code owner December 4, 2024 21:11

adriananeci changed the title ~~Populate destination name when destination server is specified~~ [fix] Populate destination name when destination server is specified Dec 4, 2024

adriananeci changed the title ~~[fix] Populate destination name when destination server is specified~~ fix: Populate destination name when destination server is specified Dec 4, 2024

adriananeci force-pushed the get_server_when_name branch from 7017210 to 44ac6c9 Compare December 4, 2024 21:18

adriananeci requested review from a team as code owners December 4, 2024 21:18

adriananeci force-pushed the get_server_when_name branch 2 times, most recently from 9ef0222 to 666316f Compare December 4, 2024 21:30

mtougeron reviewed Dec 4, 2024

View reviewed changes

util/argo/argo.go Outdated Show resolved Hide resolved

util/argo/argo.go Outdated Show resolved Hide resolved

adriananeci force-pushed the get_server_when_name branch 6 times, most recently from f469315 to 61a3db6 Compare December 9, 2024 22:52

gdsoumya requested changes Dec 10, 2024

View reviewed changes

applicationset/utils/clusterUtils.go Outdated Show resolved Hide resolved

server/application/application.go Show resolved Hide resolved

adriananeci force-pushed the get_server_when_name branch from 56ce4a2 to 728b788 Compare December 10, 2024 12:12

Populate destination name when destination server is specified

463e1f9

Signed-off-by: Adrian Aneci <aneci@adobe.com>

adriananeci force-pushed the get_server_when_name branch from 2bd2971 to 463e1f9 Compare December 10, 2024 12:18

adriananeci added 2 commits December 10, 2024 14:38

Lint nit

b6cb6af

Signed-off-by: Adrian Aneci <aneci@adobe.com>

Trigger CI

94b9247

Signed-off-by: Adrian Aneci <aneci@adobe.com>

gdsoumya approved these changes Dec 14, 2024

View reviewed changes

gdsoumya merged commit 030a7be into argoproj:master Dec 14, 2024
27 checks passed

adriananeci mentioned this pull request Dec 14, 2024

fix: Populate destination name when destination server is specified (#21063) (cherry-pick 2.13) #21176

Merged

14 tasks

adriananeci deleted the get_server_when_name branch December 14, 2024 12:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Populate destination name when destination server is specified #21063

fix: Populate destination name when destination server is specified #21063

adriananeci commented Dec 4, 2024 •

edited

Loading

bunnyshell bot commented Dec 4, 2024 •

edited

Loading

codecov bot commented Dec 9, 2024 •

edited

Loading

gdsoumya commented Dec 14, 2024

gcp-cherry-pick-bot bot commented Dec 14, 2024

gdsoumya commented Dec 14, 2024

gcp-cherry-pick-bot bot commented Dec 14, 2024

gdsoumya commented Dec 14, 2024

gcp-cherry-pick-bot bot commented Dec 14, 2024

gdsoumya commented Dec 14, 2024

adriananeci commented Dec 14, 2024 •

edited

Loading

crenshaw-dev commented Dec 14, 2024

adriananeci commented Dec 14, 2024

crenshaw-dev commented Dec 14, 2024

fix: Populate destination name when destination server is specified #21063

fix: Populate destination name when destination server is specified #21063

Conversation

adriananeci commented Dec 4, 2024 • edited Loading

bunnyshell bot commented Dec 4, 2024 • edited Loading

❌ Preview Environment deleted from Bunnyshell

codecov bot commented Dec 9, 2024 • edited Loading

Codecov Report

gdsoumya commented Dec 14, 2024

gcp-cherry-pick-bot bot commented Dec 14, 2024

gdsoumya commented Dec 14, 2024

gcp-cherry-pick-bot bot commented Dec 14, 2024

gdsoumya commented Dec 14, 2024

gcp-cherry-pick-bot bot commented Dec 14, 2024

gdsoumya commented Dec 14, 2024

adriananeci commented Dec 14, 2024 • edited Loading

crenshaw-dev commented Dec 14, 2024

adriananeci commented Dec 14, 2024

crenshaw-dev commented Dec 14, 2024

adriananeci commented Dec 4, 2024 •

edited

Loading

bunnyshell bot commented Dec 4, 2024 •

edited

Loading

codecov bot commented Dec 9, 2024 •

edited

Loading

adriananeci commented Dec 14, 2024 •

edited

Loading