Inline namespace check and create const for label

* Inlines the namespace check for valid faasd namespaces
* Creates a const for the namespace label applied to faasd
namespaces

Tested with go build and go test.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Alex Ellis (OpenFaaS Ltd)
2021-09-16 10:43:21 +01:00
parent 12b5e8ca7f
commit 5aa4c69e03
14 changed files with 41 additions and 37 deletions

View File

@ -54,14 +54,14 @@ func MakeDeployHandler(client *containerd.Client, cni gocni.CNI, secretMountPath
namespace := getRequestNamespace(req.Namespace)
// Check if namespace exists, and it has the openfaas label
nsValid, err := validateNamespace(client, namespace)
valid, err := validNamespace(client, namespace)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
if !nsValid {
if !valid {
http.Error(w, "namespace not valid", http.StatusBadRequest)
return
}