Merge pull request #27 from benc-uk:version-0.1.15

version-0.1.15

build/Dockerfile

@@ -27,7 +27,7 @@ RUN npm run build
 FROM golang:1.14-alpine as go-build
 WORKDIR /build
 ARG goPackage="github.com/benc-uk/kubeview/cmd/server"
-ARG version="0.1.13"
+ARG version="0.1.15"
 ARG buildInfo="Local manual build"
 
 ENV PORT 8000

cmd/server/main.go

@@ -85,10 +85,12 @@ func main() {
 	router.PathPrefix("/css").Handler(http.StripPrefix("/", fileServer))
 	router.PathPrefix("/img").Handler(http.StripPrefix("/", fileServer))
 	router.PathPrefix("/favicon.png").Handler(http.StripPrefix("/", fileServer))
+
 	// EVERYTHING else redirect to index.html
 	router.NotFoundHandler = http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
 		http.ServeFile(resp, req, staticDirectory+"/index.html")
 	})
+
 	log.Printf("### Serving static content from '%v'\n", staticDirectory)
 
 	// Start server

cmd/server/routes.go

@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"os"
 	"runtime"
+	"strings"
 
 	"github.com/benc-uk/go-starter/pkg/envhelper"
 	"github.com/gorilla/mux"
@@ -139,8 +140,19 @@ func routeScrapeData(resp http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	// Remove and hide Helm v3 release secrets, we're never going to show them
+	secrets.Items = filterSecrets(secrets.Items, func(v apiv1.Secret) bool {
+		return !strings.HasPrefix(v.ObjectMeta.Name, "sh.helm.release")
+	})
+
 	// Obfuscate & remove secret values
 	for _, secret := range secrets.Items {
+		// Inside 'last-applied-configuration'
+		if secret.ObjectMeta.Annotations["kubectl.kubernetes.io/last-applied-configuration"] != "" {
+			secret.ObjectMeta.Annotations["kubectl.kubernetes.io/last-applied-configuration"] = "__VALUE REDACTED__"
+		}
+
+		// And the data values of course
 		for key := range secret.Data {
 			secret.Data[key] = []byte("__VALUE REDACTED__")
 		}
@@ -180,3 +192,16 @@ func routeConfig(resp http.ResponseWriter, req *http.Request) {
 	resp.Header().Add("Content-Type", "application/json")
 	resp.Write([]byte(configJSON))
 }
+
+//
+// Filter a slice of Secrets
+//
+func filterSecrets(secretList []apiv1.Secret, f func(apiv1.Secret) bool) []apiv1.Secret {
+	newSlice := make([]apiv1.Secret, 0)
+	for _, secret := range secretList {
+		if f(secret) {
+			newSlice = append(newSlice, secret)
+		}
+	}
+	return newSlice
+}