From a16caca9b3c89f6bdbf58f9deb7b5274820558a9 Mon Sep 17 00:00:00 2001 From: Alexander Matyushentsev Date: Mon, 25 Nov 2024 11:35:08 -0800 Subject: [PATCH 1/2] fix: api server is trying to list cluster wide secrets while generating apps Signed-off-by: Alexander Matyushentsev --- cmd/argocd-server/commands/argocd_server.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/argocd-server/commands/argocd_server.go b/cmd/argocd-server/commands/argocd_server.go index 3de5d517e7d23..56bc73db87c48 100644 --- a/cmd/argocd-server/commands/argocd_server.go +++ b/cmd/argocd-server/commands/argocd_server.go @@ -163,6 +163,7 @@ func NewCommand() *cobra.Command { controllerClient, err := client.New(config, client.Options{Scheme: scheme}) errors.CheckError(err) controllerClient = client.NewDryRunClient(controllerClient) + controllerClient = client.NewNamespacedClient(controllerClient, namespace) // Load CA information to use for validating connections to the // repository server, if strict TLS validation was requested. From 86f66056948665a0c00e5a4d3ff66bcebc08a934 Mon Sep 17 00:00:00 2001 From: Alexander Matyushentsev Date: Mon, 25 Nov 2024 11:36:22 -0800 Subject: [PATCH 2/2] Revert "fix: Fix argocd appset generate failure due to missing clusterrole (#20162)" This reverts commit fad534bcfe11b5e2cfcc96079d19710a0754c9d6. --- manifests/cluster-rbac/server/argocd-server-clusterrole.yaml | 1 - manifests/ha/install.yaml | 1 - manifests/install.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/manifests/cluster-rbac/server/argocd-server-clusterrole.yaml b/manifests/cluster-rbac/server/argocd-server-clusterrole.yaml index 3ee074622c15c..b33820950fcb6 100644 --- a/manifests/cluster-rbac/server/argocd-server-clusterrole.yaml +++ b/manifests/cluster-rbac/server/argocd-server-clusterrole.yaml @@ -15,7 +15,6 @@ rules: - delete # supports deletion a live object in UI - get # supports viewing live object manifest in UI - patch # supports `argocd app patch` - - list # supports `argocd appset generate` with cluster generator - apiGroups: - "" resources: diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml index 27c6dad079abf..39805ad50ed0f 100644 --- a/manifests/ha/install.yaml +++ b/manifests/ha/install.yaml @@ -22776,7 +22776,6 @@ rules: - delete - get - patch - - list - apiGroups: - "" resources: diff --git a/manifests/install.yaml b/manifests/install.yaml index cb0091139af2c..a16a28168205d 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -22743,7 +22743,6 @@ rules: - delete - get - patch - - list - apiGroups: - "" resources: