Move manager to use ctrl runtime.

Author: mjudeikis

cli/pkg/kubectl/base/kubeconfig.go

@@ -35,11 +35,11 @@ func ParseRemoteKubeconfig(kubeconfig []byte) (host string, ns string, err error
 		return "", "", nil
 	}
 	if _, found := config.Contexts[config.CurrentContext]; !found {
-		return "", "", fmt.Errorf("current context %q of remote kubeconfig not found", config.CurrentContext)
+		return "", "", fmt.Errorf("current context '%q' of remote kubeconfig not found", config.CurrentContext)
 	}
 	cluster, found := config.Clusters[config.Contexts[config.CurrentContext].Cluster]
 	if !found {
-		return "", "", fmt.Errorf("cluster %q in current context %q of remote kubeconfig not found", config.Contexts[config.CurrentContext].Cluster, config.CurrentContext)
+		return "", "", fmt.Errorf("cluster '%q' in current context '%q' of remote kubeconfig not found", config.Contexts[config.CurrentContext].Cluster, config.CurrentContext)
 	}
 
 	return cluster.Server, config.Contexts[config.CurrentContext].Namespace, nil

cmd/example-backend/main.go

@@ -84,11 +84,11 @@ func run(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	server.OptionallyStartInformers(ctx)
+
 	if err := server.Run(ctx); err != nil {
 		return err
 	}
-	logger.Info("Listening on %s\n", server.Addr())
+	logger.Info("Listening on", "address", server.Addr())
 
 	<-ctx.Done()
 

contrib/example-backend/config.go

@@ -18,35 +18,21 @@ package backend
 
 import (
 	"fmt"
-	"time"
 
 	"github.com/kcp-dev/multicluster-provider/apiexport"
-	apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
-	apiextensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
-	kubeinformers "k8s.io/client-go/informers"
-	kubernetesclient "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
 
 	"github.com/kube-bind/kube-bind/contrib/example-backend/options"
-	bindclient "github.com/kube-bind/kube-bind/sdk/client/clientset/versioned"
-	bindinformers "github.com/kube-bind/kube-bind/sdk/client/informers/externalversions"
 )
 
 type Config struct {
 	Options *options.CompletedOptions
 
 	Provider multicluster.Provider
 
-	ClientConfig        *rest.Config
-	BindClient          *bindclient.Clientset
-	KubeClient          *kubernetesclient.Clientset
-	ApiextensionsClient *apiextensionsclient.Clientset
-
-	KubeInformers          kubeinformers.SharedInformerFactory
-	BindInformers          bindinformers.SharedInformerFactory
-	ApiextensionsInformers apiextensionsinformers.SharedInformerFactory
+	ClientConfig *rest.Config
 }
 
 func NewConfig(options *options.CompletedOptions) (*Config, error) {
@@ -63,22 +49,7 @@ func NewConfig(options *options.CompletedOptions) (*Config, error) {
 		return nil, err
 	}
 	config.ClientConfig = rest.CopyConfig(config.ClientConfig)
-	config.ClientConfig = rest.AddUserAgent(config.ClientConfig, "kube-bind-example-backend")
-
-	if config.BindClient, err = bindclient.NewForConfig(config.ClientConfig); err != nil {
-		return nil, err
-	}
-	if config.KubeClient, err = kubernetesclient.NewForConfig(config.ClientConfig); err != nil {
-		return nil, err
-	}
-	if config.ApiextensionsClient, err = apiextensionsclient.NewForConfig(config.ClientConfig); err != nil {
-		return nil, err
-	}
-
-	// construct informer factories
-	config.KubeInformers = kubeinformers.NewSharedInformerFactory(config.KubeClient, time.Minute*30)
-	config.BindInformers = bindinformers.NewSharedInformerFactory(config.BindClient, time.Minute*30)
-	config.ApiextensionsInformers = apiextensionsinformers.NewSharedInformerFactory(config.ApiextensionsClient, time.Minute*30)
+	config.ClientConfig = rest.AddUserAgent(config.ClientConfig, "kube-bind-backend")
 
 	switch options.Provider {
 	case "kcp":

contrib/example-backend/http/handler.go

@@ -32,7 +32,6 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/gorilla/securecookie"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	apiextensionslisters "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -70,9 +69,8 @@ type handler struct {
 	cookieEncryptionKey []byte
 	cookieSigningKey    []byte
 
-	client              *http.Client
-	apiextensionsLister apiextensionslisters.CustomResourceDefinitionLister
-	kubeManager         *kubernetes.Manager
+	client      *http.Client
+	kubeManager *kubernetes.Manager
 }
 
 func NewHandler(
@@ -81,7 +79,6 @@ func NewHandler(
 	cookieSigningKey, cookieEncryptionKey []byte,
 	scope kubebindv1alpha2.InformerScope,
 	mgr *kubernetes.Manager,
-	apiextensionsLister apiextensionslisters.CustomResourceDefinitionLister,
 ) (*handler, error) {
 	return &handler{
 		oidc:                provider,
@@ -92,26 +89,30 @@ func NewHandler(
 		scope:               scope,
 		client:              http.DefaultClient,
 		kubeManager:         mgr,
-		apiextensionsLister: apiextensionsLister,
 		cookieSigningKey:    cookieSigningKey,
 		cookieEncryptionKey: cookieEncryptionKey,
 	}, nil
 }
 
 func (h *handler) AddRoutes(mux *mux.Router) {
-	mux.HandleFunc("/export", h.handleServiceExport).Methods("GET")
-	mux.HandleFunc("/resources", h.handleResources).Methods("GET")
-	mux.HandleFunc("/bind", h.handleBind).Methods("GET")
-	mux.HandleFunc("/authorize", h.handleAuthorize).Methods("GET")
+	// Every route is cluster scoped.
+	mux.HandleFunc("/clusters/{cluster}/exports", h.handleServiceExport).Methods("GET")
+	mux.HandleFunc("/clusters/{cluster}/resources", h.handleResources).Methods("GET")
+	mux.HandleFunc("/clusters/{cluster}/bind", h.handleBind).Methods("GET")
+	mux.HandleFunc("/clusters/{cluster}/authorize", h.handleAuthorize).Methods("GET")
+
 	mux.HandleFunc("/callback", h.handleCallback).Methods("GET")
 }
 
 func (h *handler) handleServiceExport(w http.ResponseWriter, r *http.Request) {
 	logger := klog.FromContext(r.Context()).WithValues("method", r.Method, "url", r.URL.String())
+	logger.Info("handleServiceExport")
+
+	cluster := mux.Vars(r)["cluster"] // Not yet replace -.
 
 	oidcAuthorizeURL := h.oidcAuthorizeURL
 	if oidcAuthorizeURL == "" {
-		oidcAuthorizeURL = fmt.Sprintf("http://%s/authorize", r.Host)
+		oidcAuthorizeURL = fmt.Sprintf("http://%s/clusters/%s/authorize", r.Host, cluster)
 	}
 
 	ver, err := bindversion.BinaryVersion(componentbaseversion.Get().GitVersion)
@@ -159,11 +160,13 @@ func prepareNoCache(w http.ResponseWriter) {
 func (h *handler) handleAuthorize(w http.ResponseWriter, r *http.Request) {
 	logger := klog.FromContext(r.Context()).WithValues("method", r.Method, "url", r.URL.String())
 
+	cluster := mux.Vars(r)["cluster"]
+
 	scopes := []string{"openid", "profile", "email", "offline_access"}
 	code := &AuthCode{
 		RedirectURL: r.URL.Query().Get("u"),
 		SessionID:   r.URL.Query().Get("s"),
-		ClusterID:   r.URL.Query().Get("c"),
+		ClusterID:   cluster,
 	}
 	if p := r.URL.Query().Get("p"); p != "" && code.RedirectURL == "" {
 		code.RedirectURL = fmt.Sprintf("http://localhost:%s/callback", p)
@@ -277,40 +280,46 @@ func (h *handler) handleCallback(w http.ResponseWriter, r *http.Request) {
 	}
 
 	http.SetCookie(w, cookie.MakeCookie(r, cookieName, encoded, time.Duration(1)*time.Hour))
-	http.Redirect(w, r, "/resources?s="+authCode.SessionID, http.StatusFound)
+	http.Redirect(w, r, "/clusters/"+authCode.ClusterID+"/resources?s="+authCode.SessionID, http.StatusFound)
 }
 
 func (h *handler) handleResources(w http.ResponseWriter, r *http.Request) {
 	logger := klog.FromContext(r.Context()).WithValues("method", r.Method, "url", r.URL.String())
 
 	prepareNoCache(w)
 
+	clusterPath := mux.Vars(r)["cluster"]
+	var cluster string
+	if clusterPath == "-" {
+		cluster = "" // empty strings means - all cluster for for Multicluster-runtime. But this does not work for bind UI.
+	}
+
 	if h.testingAutoSelect != "" {
 		parts := strings.SplitN(h.testingAutoSelect, ".", 2)
-		http.Redirect(w, r, "/resources/"+parts[0]+"/"+parts[1], http.StatusFound)
+		http.Redirect(w, r, "/clusters/"+cluster+"/resources/"+parts[0]+"/"+parts[1], http.StatusFound)
 		return
 	}
 
 	labelSelector := labels.Set{
 		resources.ExportedCRDsLabel: "true",
 	}
-	crds, err := h.apiextensionsLister.List(labelSelector.AsSelector())
+	crds, err := h.kubeManager.ListCustomResourceDefinitions(r.Context(), cluster, labelSelector.AsSelector())
 	if err != nil {
 		logger.Error(err, "failed to list crds")
 		http.Error(w, "internal error", http.StatusInternalServerError)
 		return
 	}
-	sort.SliceStable(crds, func(i, j int) bool {
-		return crds[i].Name < crds[j].Name
+	sort.SliceStable(crds.Items, func(i, j int) bool {
+		return crds.Items[i].Name < crds.Items[j].Name
 	})
 	rightScopedCRDs := []*apiextensionsv1.CustomResourceDefinition{}
-	for _, crd := range crds {
+	for _, crd := range crds.Items {
 		if h.scope == kubebindv1alpha2.ClusterScope || crd.Spec.Scope == apiextensionsv1.NamespaceScoped {
-			rightScopedCRDs = append(rightScopedCRDs, crd)
+			rightScopedCRDs = append(rightScopedCRDs, &crd)
 		}
 	}
 
-	apiResourceSchemas, err := h.kubeManager.ListAPIResourceSchemas(r.Context())
+	apiResourceSchemas, err := h.kubeManager.ListAPIResourceSchemas(r.Context(), cluster)
 	if err != nil {
 		logger.Error(err, "failed to get api resource schemas")
 		http.Error(w, "internal error", http.StatusInternalServerError)
@@ -319,10 +328,12 @@ func (h *handler) handleResources(w http.ResponseWriter, r *http.Request) {
 	bs := bytes.Buffer{}
 	if err := resourcesTemplate.Execute(&bs, struct {
 		SessionID          string
+		Cluster            string
 		CRDs               []*apiextensionsv1.CustomResourceDefinition
 		APIResourceSchemas []kubebindv1alpha2.APIResourceSchema
 	}{
 		SessionID:          r.URL.Query().Get("s"),
+		Cluster:            clusterPath,
 		CRDs:               rightScopedCRDs,
 		APIResourceSchemas: apiResourceSchemas.Items,
 	}); err != nil {
@@ -368,7 +379,12 @@ func (h *handler) handleBind(w http.ResponseWriter, r *http.Request) {
 
 	group := r.URL.Query().Get("group")
 	resource := r.URL.Query().Get("resource")
-	kfg, err := h.kubeManager.HandleResources(r.Context(), idToken.Subject+"#"+state.ClusterID, resource, group)
+	cluster := mux.Vars(r)["cluster"]
+	if cluster == "-" {
+		cluster = ""
+	}
+
+	kfg, err := h.kubeManager.HandleResources(r.Context(), idToken.Subject+"#"+state.ClusterID, cluster, resource, group)
 	if err != nil {
 		logger.Error(err, "failed to handle resources")
 		http.Error(w, "internal error", http.StatusInternalServerError)
@@ -414,6 +430,7 @@ func (h *handler) handleBind(w http.ResponseWriter, r *http.Request) {
 		Kubeconfig: kfg,
 		Requests:   []runtime.RawExtension{{Raw: requestBytes}},
 	}
+
 	payload, err := json.Marshal(&response)
 	if err != nil {
 		logger.Error(err, "failed to marshal auth response")

contrib/example-backend/kubernetes/indexers.go

@@ -18,6 +18,7 @@ package kubernetes
 
 import (
 	corev1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/kube-bind/kube-bind/contrib/example-backend/kubernetes/resources"
 )
@@ -26,15 +27,15 @@ const (
 	NamespacesByIdentity = "namespacesByIdentity"
 )
 
-func IndexNamespacesByIdentity(obj any) ([]string, error) {
+func IndexNamespacesByIdentity(obj client.Object) []string {
 	ns, ok := obj.(*corev1.Namespace)
 	if !ok {
-		return nil, nil
+		return nil
 	}
 
 	if id, found := ns.Annotations[resources.IdentityAnnotationKey]; found {
-		return []string{id}, nil
+		return []string{id}
 	}
 
-	return nil, nil
+	return nil
 }