Silence errors for namespace listing

Fixes: openfaas#724

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

chart/openfaas/templates/gateway-dep.yaml

@@ -237,6 +237,8 @@ spec:
           value: "{{ .Values.faasnetes.livenessProbe.timeoutSeconds }}"
         - name: liveness_probe_period_seconds
           value: "{{ .Values.faasnetes.livenessProbe.periodSeconds }}"
+        - name: cluster_role
+          value: "{{ .Values.clusterRole }}"
         volumeMounts:
         - mountPath: /tmp
           name: faas-netes-temp-volume

main.go

@@ -135,7 +135,7 @@ func main() {
 		runController(setup)
 	} else {
 		log.Println("Starting operator")
-		runOperator(setup)
+		runOperator(setup, config)
 	}
 }
 
@@ -178,14 +178,14 @@ func runController(setup serverSetup) {
 		InfoHandler:          handlers.MakeInfoHandler(version.BuildVersion(), version.GitCommit),
 		SecretHandler:        handlers.MakeSecretHandler(config.DefaultFunctionNamespace, kubeClient),
 		LogHandler:           logs.NewLogHandlerFunc(k8s.NewLogRequestor(kubeClient, config.DefaultFunctionNamespace), config.FaaSConfig.WriteTimeout),
-		ListNamespaceHandler: handlers.MakeNamespacesLister(config.DefaultFunctionNamespace, kubeClient),
+		ListNamespaceHandler: handlers.MakeNamespacesLister(config.DefaultFunctionNamespace, config.ClusterRole, kubeClient),
 	}
 
 	faasProvider.Serve(&bootstrapHandlers, &config.FaaSConfig)
 }
 
 // runOperator runs the CRD Operator
-func runOperator(setup serverSetup) {
+func runOperator(setup serverSetup, cfg config.BootstrapConfig) {
 	// pull out the required config and clients fromthe setup, this is largely a
 	// leftover from refactoring the setup to a shared step and keeping the function
 	// signature readable
@@ -218,7 +218,7 @@ func runOperator(setup serverSetup) {
 		factory,
 	)
 
-	srv := server.New(faasClient, kubeClient, endpointsInformer, deploymentInformer)
+	srv := server.New(faasClient, kubeClient, endpointsInformer, deploymentInformer, cfg.ClusterRole)
 
 	go faasInformerFactory.Start(stopCh)
 	go kubeInformerFactory.Start(stopCh)

pkg/handlers/namespaces.go

@@ -19,26 +19,29 @@ import (
 )
 
 // MakeNamespacesLister builds a list of namespaces with an "openfaas" tag, or the default name
-func MakeNamespacesLister(defaultNamespace string, clientset kubernetes.Interface) http.HandlerFunc {
+func MakeNamespacesLister(defaultNamespace string, clusterRole bool, clientset kubernetes.Interface) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		log.Println("Query namespaces")
+		// log.Println("List namespaces")
 
 		if r.Body != nil {
 			defer r.Body.Close()
 		}
 
-		res := ListNamespaces(defaultNamespace, clientset)
+		namespaces := []string{}
+		if clusterRole {
+			namespaces = ListNamespaces(defaultNamespace, clientset)
+		} else {
+			namespaces = append(namespaces, defaultNamespace)
+		}
 
-		out, err := json.Marshal(res)
+		out, err := json.Marshal(namespaces)
 		if err != nil {
 			glog.Errorf("Failed to list namespaces: %s", err.Error())
-			w.WriteHeader(http.StatusInternalServerError)
-			w.Write([]byte("Failed to list namespaces"))
+			http.Error(w, "Failed to list namespaces", http.StatusInternalServerError)
 			return
 		}
 
 		w.Header().Set("Content-Type", "application/json")
-
 		w.WriteHeader(http.StatusOK)
 		w.Write(out)
 	}

pkg/handlers/replicas.go

@@ -10,6 +10,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"time"
 
 	"github.com/gorilla/mux"
 	"github.com/openfaas/faas-provider/types"
@@ -102,6 +103,7 @@ func MakeReplicaReader(defaultNamespace string, clientset *kubernetes.Clientset)
 			lookupNamespace = namespace
 		}
 
+		s := time.Now()
 		function, err := getService(lookupNamespace, functionName, clientset)
 		if err != nil {
 			log.Printf("Unable to fetch service: %s %s\n", functionName, namespace)
@@ -113,8 +115,8 @@ func MakeReplicaReader(defaultNamespace string, clientset *kubernetes.Clientset)
 			w.WriteHeader(http.StatusNotFound)
 			return
 		}
-
-		log.Printf("Read replicas - %s %s, %d/%d\n", functionName, lookupNamespace, function.AvailableReplicas, function.Replicas)
+		d := time.Since(s)
+		log.Printf("Replicas: %s.%s, (%d/%d)\t%dms\n", functionName, lookupNamespace, function.AvailableReplicas, function.Replicas, d.Milliseconds())
 
 		functionBytes, err := json.Marshal(function)
 		if err != nil {

pkg/server/server.go

@@ -34,7 +34,8 @@ const defaultWriteTimeout = 8
 func New(client clientset.Interface,
 	kube kubernetes.Interface,
 	endpointsInformer coreinformer.EndpointsInformer,
-	deploymentsInformer appsinformer.DeploymentInformer) *Server {
+	deploymentsInformer appsinformer.DeploymentInformer,
+	clusterRole bool) *Server {
 
 	functionNamespace := "openfaas-fn"
 	if namespace, exists := os.LookupEnv("function_namespace"); exists {
@@ -92,8 +93,8 @@ func New(client clientset.Interface,
 		HealthHandler:        makeHealthHandler(),
 		InfoHandler:          makeInfoHandler(),
 		SecretHandler:        handlers.MakeSecretHandler(functionNamespace, kube),
-		ListNamespaceHandler: handlers.MakeNamespacesLister(functionNamespace, kube),
 		LogHandler:           logs.NewLogHandlerFunc(faasnetesk8s.NewLogRequestor(kube, functionNamespace), bootstrapConfig.WriteTimeout),
+		ListNamespaceHandler: handlers.MakeNamespacesLister(functionNamespace, clusterRole, kube),
 	}
 
 	if pprof == "true" {