Merge pull request #47 from datum-cloud/feat/useextras

feat: use extra for project/cluster

Author: scotwells

internal/webhook/server.go

@@ -2,9 +2,7 @@ package webhook
 
 import (
 	"context"
-	"fmt"
 	"net/http"
-	"net/url"
 
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
@@ -22,17 +20,12 @@ var _ webhook.Server = &clusterAwareWebhookServer{}
 
 func (s *clusterAwareWebhookServer) Register(path string, hook http.Handler) {
 	if h, ok := hook.(*admission.Webhook); ok {
-		h.WithContextFunc = func(ctx context.Context, req *http.Request) context.Context {
-			clusterName, err := url.QueryUnescape(req.PathValue("cluster_name"))
-			if err != nil {
-				return ctx
-			}
-			return mccontext.WithCluster(ctx, clusterName)
-		}
-	}
-
-	if s.discoveryMode != multiclusterproviders.ProviderSingle {
-		path = fmt.Sprintf("/clusters/{cluster_name}%s", path)
+		orig := h.Handler
+		h.Handler = admission.HandlerFunc(func(ctx context.Context, req admission.Request) admission.Response {
+			c := clusterFromExtra(req.UserInfo.Extra)
+			ctx = mccontext.WithCluster(ctx, c)
+			return orig.Handle(ctx, req)
+		})
 	}
 
 	s.Server.Register(path, hook)

internal/webhook/util.go

@@ -0,0 +1,14 @@
+package webhook
+
+import authv1 "k8s.io/api/authentication/v1"
+
+const (
+	ParentNameExtraKey = "iam.miloapis.com/parent-name"
+)
+
+func clusterFromExtra(extra map[string]authv1.ExtraValue) string {
+	if v, ok := extra[ParentNameExtraKey]; ok && len(v) > 0 && v[0] != "" {
+		return v[0]
+	}
+	return ""
+}