Răsfoiți Sursa

quick fix helm type issue

Alexander Belanger 5 ani în urmă
părinte
comite
e1931df618
2 a modificat fișierele cu 9 adăugiri și 23 ștergeri
  1. 9 1
      internal/helm/agent.go
  2. 0 22
      server/api/chart_handler_test.go

+ 9 - 1
internal/helm/agent.go

@@ -1,6 +1,7 @@
 package helm
 
 import (
+	"errors"
 	"io/ioutil"
 
 	"github.com/porter-dev/porter/internal/config"
@@ -13,6 +14,7 @@ import (
 
 	"helm.sh/helm/v3/pkg/chartutil"
 	kubefake "helm.sh/helm/v3/pkg/kube/fake"
+	k8s "k8s.io/client-go/kubernetes"
 )
 
 // Agent is a Helm agent for performing helm operations
@@ -69,11 +71,17 @@ func (h *Form) ToAgent(
 		return nil, err
 	}
 
+	clientset, ok := k8sAgent.Clientset.(*k8s.Clientset)
+
+	if !ok {
+		return nil, errors.New("Agent Clientset was not of type *(k8s.io/client-go/kubernetes).Clientset")
+	}
+
 	// use k8s agent to create Helm agent
 	return &Agent{&action.Configuration{
 		RESTClientGetter: k8sAgent.RESTClientGetter,
 		KubeClient:       kube.New(k8sAgent.RESTClientGetter),
-		Releases:         StorageMap[h.Storage](l, h.Namespace, k8sAgent.Clientset),
+		Releases:         StorageMap[h.Storage](l, h.Namespace, clientset),
 		Log:              l.Printf,
 	}}, nil
 }

+ 0 - 22
server/api/chart_handler_test.go

@@ -25,28 +25,6 @@ type releaseStub struct {
 	status       release.Status
 }
 
-// type ListFilter struct {
-// 	Namespace    string   `json:"namespace"`
-// 	Limit        int      `json:"limit"`
-// 	Skip         int      `json:"skip"`
-// 	ByDate       bool     `json:"byDate"`
-// 	StatusFilter []string `json:"statusFilter"`
-// }
-
-// type Form struct {
-// 	KubeConfig      []byte   `form:"required"`
-// 	AllowedContexts []string `form:"required"`
-// 	Context         string   `json:"context" form:"required"`
-// 	Storage         string   `json:"storage" form:"oneof=secret configmap memory"`
-// 	Namespace       string   `json:"namespace"`
-// }
-
-// type ListChartForm struct {
-// 	HelmOptions *helm.Form       `json:"helm" form:"required"`
-// 	ListFilter  *helm.ListFilter `json:"filter" form:"required"`
-// 	UserID      uint             `json:"user_id"`
-// }
-
 // ------------------------- TEST TYPES AND MAIN LOOP ------------------------- //
 
 type chartTest struct {