From 11ff356ccea32b89b9da556c18305cd7c5ea9ba5 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Mon, 20 Jul 2020 10:05:37 +0100 Subject: [PATCH] Remove service namespace from scale request This field doesn't appear to be used and is supplied via the querystring which faas-netes (the only ns-enabled provider already consumes) Related to PR: https://github.com/openfaas/faas-netes/pull/671 Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- gateway/plugin/external.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gateway/plugin/external.go b/gateway/plugin/external.go index a6454ded..c75e6bfc 100644 --- a/gateway/plugin/external.go +++ b/gateway/plugin/external.go @@ -27,13 +27,6 @@ type ExternalServiceQuery struct { AuthInjector middleware.AuthInjector } -// ScaleServiceRequest request scaling of replica -type ScaleServiceRequest struct { - ServiceName string `json:"serviceName"` - ServiceNamespace string `json:"serviceNamespace"` - Replicas uint64 `json:"replicas"` -} - // NewExternalServiceQuery proxies service queries to external plugin via HTTP func NewExternalServiceQuery(externalURL url.URL, authInjector middleware.AuthInjector) scaling.ServiceQuery { timeout := 3 * time.Second @@ -134,10 +127,9 @@ func (s ExternalServiceQuery) GetReplicas(serviceName, serviceNamespace string) func (s ExternalServiceQuery) SetReplicas(serviceName, serviceNamespace string, count uint64) error { var err error - scaleReq := ScaleServiceRequest{ - ServiceName: serviceName, - Replicas: count, - ServiceNamespace: serviceNamespace, + scaleReq := types.ScaleServiceRequest{ + ServiceName: serviceName, + Replicas: count, } requestBody, err := json.Marshal(scaleReq)