Przeglądaj źródła

more compile issues

Alexander Belanger 4 lat temu
rodzic
commit
5bd6defe5f

+ 1 - 1
api/server/authz/release.go

@@ -49,7 +49,7 @@ func (p *ReleaseScopedMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reque
 	// get the version for the application
 	version, _ := requestutils.GetURLParamUint(r, types.URLParamReleaseVersion)
 
-	release, err := helmAgent.GetRelease(name, int(version))
+	release, err := helmAgent.GetRelease(name, int(version), false)
 
 	if err != nil {
 		apierrors.HandleAPIError(p.config, w, r, apierrors.NewErrInternal(err))

+ 1 - 1
api/server/handlers/cluster/stream_helm_release.go

@@ -51,7 +51,7 @@ func (c *StreamHelmReleaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	err = agent.StreamHelmReleases(conn, request.Charts, request.Selectors)
+	err = agent.StreamHelmReleases(conn, request.Namespace, request.Charts, request.Selectors)
 
 	if err != nil {
 		c.HandleAPIError(w, r, apierrors.NewErrInternal(err))

+ 1 - 1
api/server/handlers/release/update_image_batch.go

@@ -78,7 +78,7 @@ func (c *UpdateImageBatchHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque
 		go func() {
 			defer wg.Done()
 			// read release via agent
-			rel, err := helmAgent.GetRelease(releases[index].Name, 0)
+			rel, err := helmAgent.GetRelease(releases[index].Name, 0, false)
 
 			if err != nil {
 				mu.Lock()

+ 1 - 1
api/server/handlers/release/upgrade_webhook.go

@@ -68,7 +68,7 @@ func (c *WebhookHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	rel, err := helmAgent.GetRelease(release.Name, 0)
+	rel, err := helmAgent.GetRelease(release.Name, 0, true)
 
 	// repository is set to current repository by default
 	repository := rel.Config["image"].(map[string]interface{})["repository"]

+ 1 - 0
api/types/helm_release.go

@@ -3,4 +3,5 @@ package types
 type StreamHelmReleaseRequest struct {
 	Selectors string   `schema:"selectors"`
 	Charts    []string `schema:"charts"`
+	Namespace string   `schema:"namespace"`
 }