fix resource attribute list and retrieve namespace from kubeconfig

replicatedhq · Nov 1, 2024 · 0ab8979 · 0ab8979
1 parent 500e8a7
commit 0ab8979
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/cmd/troubleshoot/cli/run.go b/cmd/troubleshoot/cli/run.go
@@ -187,6 +187,11 @@ func runTroubleshoot(v *viper.Viper, args []string) error {
 		RunHostCollectorsInPod:    mainBundle.Spec.RunHostCollectorsInPod,
 	}
 
+	if createOpts.Namespace == "" {
+		kubeconfig := k8sutil.GetKubeconfig()
+		createOpts.Namespace, _, _ = kubeconfig.Namespace()
+	}
+
 	nonInteractiveOutput := analysisOutput{}
 
 	response, err := supportbundle.CollectSupportBundleFromSpec(&mainBundle.Spec, additionalRedactors, createOpts)

diff --git a/pkg/preflight/run.go b/pkg/preflight/run.go
@@ -356,6 +356,11 @@ func collectInCluster(
 		BundlePath:             bundlePath,
 	}
 
+	if collectOpts.Namespace == "" {
+		kubeconfig := k8sutil.GetKubeconfig()
+		collectOpts.Namespace, _, _ = kubeconfig.Namespace()
+	}
+
 	if v.GetString("since") != "" || v.GetString("since-time") != "" {
 		err := parseTimeFlags(v, preflightSpec.Spec.Collectors)
 		if err != nil {

diff --git a/pkg/supportbundle/rbac.go b/pkg/supportbundle/rbac.go
@@ -35,6 +35,11 @@ func checkRemoteCollectorRBAC(ctx context.Context, clientConfig *rest.Config, ti
 	var forbidden []error
 
 	resourceAttributesList := []authorizationv1.ResourceAttributes{
+		{
+			Namespace: namespace,
+			Verb:      "get",
+			Resource:  "pods",
+		},
 		{
 			Namespace: namespace,
 			Verb:      "create",
@@ -45,15 +50,35 @@ func checkRemoteCollectorRBAC(ctx context.Context, clientConfig *rest.Config, ti
 			Verb:      "delete",
 			Resource:  "pods",
 		},
+		{
+			Namespace: namespace,
+			Verb:      "get",
+			Resource:  "pods/log",
+		},
 		{
 			Verb:     "list",
 			Resource: "nodes",
 		},
+		{
+			Namespace: namespace,
+			Verb:      "get",
+			Resource:  "configmaps",
+		},
 		{
 			Namespace: namespace,
 			Verb:      "create",
 			Resource:  "configmaps",
 		},
+		{
+			Namespace: namespace,
+			Verb:      "delete",
+			Resource:  "configmaps",
+		},
+		{
+			Namespace: namespace,
+			Verb:      "get",
+			Resource:  "serviceaccounts",
+		},
 	}
 
 	for _, resourceAttributes := range resourceAttributesList {