Merge pull request #1879 from bertinatto/fix-manifestclient-namespaces-discovery

manifestclient: fix discovery of namespaces

Author: openshift-merge-bot[bot]

pkg/manifestclient/group_resource_discovery.go

@@ -4,11 +4,12 @@ import (
 	"errors"
 	"fmt"
 	"io/fs"
-	"k8s.io/apimachinery/pkg/util/json"
 	"path/filepath"
-	"sigs.k8s.io/yaml"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/util/json"
+	"sigs.k8s.io/yaml"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apirequest "k8s.io/apiserver/pkg/endpoints/request"
 )
@@ -114,6 +115,20 @@ func (mrt *manifestRoundTripper) getLegacyGroupResourceDiscovery(requestInfo *ap
 		for resourceName, apiResource := range apiResourcesForNamespace {
 			apiResources[resourceName] = apiResource
 		}
+
+		// Namespaces are special: each namespace is stored in its own file within the namespace directory
+		namespacePath := filepath.Join("namespaces", namespaceDirEntry.Name(), namespaceDirEntry.Name()+".yaml")
+		if namespaceObj, err := readIndividualFile(mrt.sourceFS, namespacePath); err == nil {
+			// It's currently not guaranteed that the file is always present
+			apiResources["namespaces"] = metav1.APIResource{
+				Name:       "namespaces",
+				Kind:       namespaceObj.GetKind(),
+				Group:      namespaceObj.GroupVersionKind().Group,
+				Version:    namespaceObj.GroupVersionKind().Version,
+				Namespaced: false,
+				Verbs:      []string{"get", "list", "watch"},
+			}
+		}
 	}
 
 	for _, apiResource := range apiResources {