Adding ReasonForError usage:

Gopkg.toml

@@ -13,7 +13,7 @@
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  branch = "release-1.8"
+  branch = "release-1.9"
 
 [[constraint]]
   name = "k8s.io/client-go"

handlers/secrets.go

@@ -54,8 +54,9 @@ func getSecretsHandler(kube typedV1.SecretInterface, w http.ResponseWriter, r *h
 	selector := fmt.Sprintf("%s=%s", secretLabel, secretLabelValue)
 	res, err := kube.List(metav1.ListOptions{LabelSelector: selector})
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		log.Printf("Secrets query error: %v\n", err)
+		status, reason := processErrorReasons(err)
+		log.Printf("Secret list error reason: %s, %v\n", reason, err)
+		w.WriteHeader(status)
 		return
 	}
 
@@ -86,8 +87,9 @@ func createSecretHandler(kube typedV1.SecretInterface, namespace string, w http.
 	}
 	_, err = kube.Create(secret)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		log.Printf("Secret create error: %v\n", err)
+		status, reason := processErrorReasons(err)
+		log.Printf("Secret create error reason: %s, %v\n", reason, err)
+		w.WriteHeader(status)
 		return
 	}
 	log.Printf("Secret %s create\n", secret.GetName())
@@ -115,8 +117,9 @@ func replaceSecretHandler(kube typedV1.SecretInterface, namespace string, w http
 	secret.StringData = newSecret.StringData
 	_, err = kube.Update(secret)
 	if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		log.Printf("Secret update error: %v\n", err)
+		status, reason := processErrorReasons(err)
+		log.Printf("Secret update error reason: %s, %v\n", reason, err)
+		w.WriteHeader(status)
 		return
 	}
 	log.Printf("Secret %s updated", secret.GetName())
@@ -136,8 +139,9 @@ func deleteSecretHandler(kube typedV1.SecretInterface, namespace string, w http.
 		w.WriteHeader(http.StatusNotFound)
 		return
 	} else if err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-		log.Printf("Secret %s delete error: %v\n", secret.GetName(), err)
+		status, reason := processErrorReasons(err)
+		log.Printf("Secret delete error reason: %s, %v\n", reason, err)
+		w.WriteHeader(status)
 		return
 	}
 	log.Printf("Secret %s deleted\n", secret.GetName())
@@ -311,3 +315,21 @@ func removeVolumeMount(volumeName string, mounts []apiv1.VolumeMount) []apiv1.Vo
 func isNotFound(err error) bool {
 	return k8serrors.IsNotFound(err) || k8serrors.IsGone(err)
 }
+
+// processErrorReasons maps k8serrors.ReasonForError to http status codes
+func processErrorReasons(err error) (int, metav1.StatusReason) {
+	switch {
+	case k8serrors.ReasonForError(err) == metav1.StatusReasonConflict:
+		return http.StatusConflict, metav1.StatusReasonConflict
+	case k8serrors.ReasonForError(err) == metav1.StatusReasonInvalid:
+		return http.StatusUnprocessableEntity, metav1.StatusReasonInvalid
+	case k8serrors.ReasonForError(err) == metav1.StatusReasonBadRequest:
+		return http.StatusBadRequest, metav1.StatusReasonBadRequest
+	case k8serrors.ReasonForError(err) == metav1.StatusReasonForbidden:
+		return http.StatusForbidden, metav1.StatusReasonForbidden
+	case k8serrors.ReasonForError(err) == metav1.StatusReasonTimeout:
+		return http.StatusRequestTimeout, metav1.StatusReasonTimeout
+	default:
+		return http.StatusInternalServerError, metav1.StatusReasonInternalError
+	}
+}

handlers/secrets_test.go

@@ -1,12 +1,17 @@
 package handlers
 
 import (
+	"errors"
 	"fmt"
+	"net/http"
 	"testing"
 
 	"github.com/openfaas/faas/gateway/requests"
 	apiv1 "k8s.io/api/core/v1"
 	v1beta1 "k8s.io/api/extensions/v1beta1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 func Test_UpdateSecrets_DoesNotAddVolumeIfRequestSecretsIsNil(t *testing.T) {
@@ -226,6 +231,30 @@ func Test_UpdateSecrets_RemovesSecretsVolumeIfRequestSecretsIsEmptyOrNil(t *test
 	validateEmptySecretVolumesAndMounts(t, deployment)
 }
 
+func Test_DefaultErrorReason(t *testing.T) {
+	err := errors.New("A default error mapping")
+	status, reason := processErrorReasons(err)
+	if status != http.StatusInternalServerError {
+		t.Errorf("Unexpected default status code: %d", status)
+	}
+	if reason != metav1.StatusReasonInternalError {
+		t.Errorf("Unexpected default reason: %s", reason)
+	}
+}
+
+func Test_ConflictErrorReason(t *testing.T) {
+	gv := schema.GroupResource{Group: "testing", Resource: "testing"}
+	statusError := k8serrors.NewConflict(gv, "conflict_test", errors.New("A test error for confict"))
+
+	status, reason := processErrorReasons(statusError)
+	if status != http.StatusConflict {
+		t.Errorf("Unexpected default status code: %d", status)
+	}
+	if !k8serrors.IsConflict(statusError) {
+		t.Errorf("Unexpected default reason: %s", reason)
+	}
+}
+
 func validateEmptySecretVolumesAndMounts(t *testing.T, deployment *v1beta1.Deployment) {
 	numVolumes := len(deployment.Spec.Template.Spec.Volumes)
 	if numVolumes != 0 {