Przeglądaj źródła

decoding kubeconfig (#2908)

Stefan McShane 3 lat temu
rodzic
commit
b1f1fc13cb

+ 9 - 0
Tiltfile

@@ -80,6 +80,15 @@ local_resource(
     trigger_mode=TRIGGER_MODE_MANUAL,
 )
 
+# Config
+local_resource(
+    name="reload-config",
+    cmd='''kubectl rollout restart deploy/porter-server-web''',
+    resource_deps=["zarf/helm"],
+    labels=["porter"],
+    trigger_mode=TRIGGER_MODE_MANUAL,
+)
+
 
 allow_k8s_contexts('kind-porter')
 

+ 0 - 2
api/server/authz/api_contract.go

@@ -45,7 +45,6 @@ func (n *APIContractRevisionMiddleware) ServeHTTP(w http.ResponseWriter, r *http
 		return
 	}
 
-	fmt.Println("STEFAN", uid)
 	rev, err := n.config.Repo.APIContractRevisioner().Get(ctx, uid)
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
@@ -57,7 +56,6 @@ func (n *APIContractRevisionMiddleware) ServeHTTP(w http.ResponseWriter, r *http
 		apierrors.HandleAPIError(n.config.Logger, n.config.Alerter, w, r, apierrors.NewErrInternal(err), true)
 		return
 	}
-	fmt.Println("STEFANREV", rev)
 
 	r = r.Clone(NewAPIContractRevisionContext(ctx, rev))
 	n.next.ServeHTTP(w, r)

+ 7 - 2
api/server/handlers/cluster/get_kubeconfig.go

@@ -2,6 +2,7 @@ package cluster
 
 import (
 	"context"
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"net/http"
@@ -57,13 +58,17 @@ func (c *GetTemporaryKubeconfigHandler) ServeHTTP(w http.ResponseWriter, r *http
 			c.HandleAPIError(w, r, apierrors.NewErrInternal(fmt.Errorf("error getting temporary capi config: %w", err)))
 			return
 		}
-
 		if kubeconfigResp.Msg == nil {
 			c.HandleAPIError(w, r, apierrors.NewErrInternal(fmt.Errorf("error reading temporary capi config: %w", err)))
 			return
 		}
+		b64, err := base64.StdEncoding.DecodeString(kubeconfigResp.Msg.KubeConfig)
+		if err != nil {
+			c.HandleAPIError(w, r, apierrors.NewErrInternal(fmt.Errorf("unable to decode base64 kubeconfig: %w", err)))
+			return
+		}
 		res := &types.GetTemporaryKubeconfigResponse{
-			Kubeconfig: []byte(kubeconfigResp.Msg.KubeConfig),
+			Kubeconfig: b64,
 		}
 		c.WriteResult(w, r, res)
 		return