Skip to content

Commit 23aa005

Browse files
committed
First pass of cluster cache tainting
Signed-off-by: Jonathan Ogilvie <[email protected]>
1 parent ee6c26d commit 23aa005

35 files changed

+2464
-1119
lines changed

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ui/dist/app/*
99
site/
1010
*.iml
1111
.tilt-bin/
12+
CLAUDE.local.md
1213
# delve debug binaries
1314
cmd/**/debug
1415
debug.test
@@ -30,4 +31,8 @@ cmd/argocd-repo-server/argocd-repo-server
3031
cmd/argocd-server/argocd-server
3132

3233
# ignore generated `.argocd-helm-dep-up` marker file; this should not be committed to git
33-
reposerver/repository/testdata/**/.argocd-helm-dep-up
34+
reposerver/repository/testdata/**/.argocd-helm-dep-up
35+
36+
# ignore temporary test artifacts that should not be committed
37+
reposerver/repository/testdata/app-parameters[0-9]*
38+
test/e2e/testdata/*/Chart.lock

assets/swagger.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controller/appcontroller.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,9 +1857,8 @@ func (ctrl *ApplicationController) processAppRefreshQueueItem() (processNext boo
18571857
// 4. Check if the app directly uses any tainted resources
18581858
clusterURL := app.Spec.Destination.Server
18591859
// Check if cluster is tainted directly using our cluster taint tracking
1860-
statecache.ClusterTaintLock.RLock()
1861-
taints, exists := statecache.GetClusterTaints()[clusterURL]
1862-
statecache.ClusterTaintLock.RUnlock()
1860+
allTaints := statecache.GetClusterTaints()
1861+
taints, exists := allTaints[clusterURL]
18631862

18641863
// If the cluster is tainted, check if the app uses any of the affected resource types
18651864
if exists && len(taints) > 0 {

0 commit comments

Comments
 (0)