Allow disabling the dashboard (#639)

sudermanjr · web-flow · commit 8eb60d164054 · 2023-08-29T12:27:40.000-06:00
diff --git a/cmd/dashboard.go b/cmd/dashboard.go
@@ -31,6 +31,7 @@ var (
 	showAllVPAs  bool
 	basePath     string
 	insightsHost string
+	enableCost   bool
 )
 
 func init() {
@@ -40,6 +41,7 @@ func init() {
 	dashboardCmd.PersistentFlags().BoolVar(&onByDefault, "on-by-default", false, "Display every namespace that isn't explicitly excluded.")
 	dashboardCmd.PersistentFlags().BoolVar(&showAllVPAs, "show-all", false, "Display every VPA, even if it isn't managed by Goldilocks")
 	dashboardCmd.PersistentFlags().StringVar(&basePath, "base-path", "/", "Path on which the dashboard is served.")
+	dashboardCmd.PersistentFlags().BoolVar(&enableCost, "enable-cost", true, "If set to false, the cost integration will be disabled on the dashboard.")
 	dashboardCmd.PersistentFlags().StringVar(&insightsHost, "insights-host", "https://insights.fairwinds.com", "Insights host for retrieving optional cost data.")
 }
 
@@ -56,6 +58,7 @@ var dashboardCmd = &cobra.Command{
 			dashboard.OnByDefault(onByDefault),
 			dashboard.ShowAllVPAs(showAllVPAs),
 			dashboard.InsightsHost(insightsHost),
+			dashboard.EnableCost(enableCost),
 		)
 		http.Handle("/", router)
 		klog.Infof("Starting goldilocks dashboard server on port %d and basePath %v", serverPort, validBasePath)
diff --git a/pkg/dashboard/dashboard.go b/pkg/dashboard/dashboard.go
@@ -71,11 +71,11 @@ func Dashboard(opts Options) http.Handler {
 		}
 
 		data := struct {
-			VpaData      summary.Summary
-			InsightsHost string
+			VpaData summary.Summary
+			Opts    Options
 		}{
-			VpaData:      vpaData,
-			InsightsHost: opts.insightsHost,
+			VpaData: vpaData,
+			Opts:    opts,
 		}
 
 		writeTemplate(tmpl, opts, &data, w)
@@ -114,14 +114,14 @@ func API(opts Options) http.Handler {
 func getVPAData(opts Options, namespace, costPerCPU, costPerGB string) (summary.Summary, error) {
 
 	filterLabels := make(map[string]string)
-	if !opts.showAllVPAs {
-		filterLabels = opts.vpaLabels
+	if !opts.ShowAllVPAs {
+		filterLabels = opts.VpaLabels
 	}
 
 	summarizer := summary.NewSummarizer(
 		summary.ForNamespace(namespace),
 		summary.ForVPAsWithLabels(filterLabels),
-		summary.ExcludeContainers(opts.excludedContainers),
+		summary.ExcludeContainers(opts.ExcludedContainers),
 	)
 
 	vpaData, err := summarizer.GetSummary()
diff --git a/pkg/dashboard/namespace-list.go b/pkg/dashboard/namespace-list.go
@@ -16,7 +16,7 @@ import (
 func NamespaceList(opts Options) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var listOptions v1.ListOptions
-		if opts.onByDefault || opts.showAllVPAs {
+		if opts.OnByDefault || opts.ShowAllVPAs {
 			listOptions = v1.ListOptions{
 				LabelSelector: fmt.Sprintf("%s!=false", utils.VpaEnabledLabel),
 			}
@@ -48,17 +48,23 @@ func NamespaceList(opts Options) http.Handler {
 		// this helps to not leak additional information like
 		// annotations, labels, metadata about the Namespace to the
 		// client UI source code or javascript console
-		data := []struct {
-			Name string
-		}{}
+
+		data := struct {
+			Namespaces []struct {
+				Name string
+			}
+			Opts Options
+		}{
+			Opts: opts,
+		}
 
 		for _, ns := range namespacesList.Items {
 			item := struct {
 				Name string
 			}{
 				Name: ns.Name,
 			}
-			data = append(data, item)
+			data.Namespaces = append(data.Namespaces, item)
 		}
 
 		writeTemplate(tmpl, opts, &data, w)
diff --git a/pkg/dashboard/options.go b/pkg/dashboard/options.go
@@ -10,69 +10,77 @@ type Option func(*Options)
 
 // Options are options for getting and caching the Summarizer's VPAs
 type Options struct {
-	port               int
-	basePath           string
-	vpaLabels          map[string]string
-	excludedContainers sets.Set[string]
-	onByDefault        bool
-	showAllVPAs        bool
-	insightsHost       string
+	Port               int
+	BasePath           string
+	VpaLabels          map[string]string
+	ExcludedContainers sets.Set[string]
+	OnByDefault        bool
+	ShowAllVPAs        bool
+	InsightsHost       string
+	EnableCost         bool
 }
 
 // default options for the dashboard
 func defaultOptions() *Options {
 	return &Options{
-		port:               8080,
-		basePath:           "/",
-		vpaLabels:          utils.VPALabels,
-		excludedContainers: sets.Set[string]{},
-		onByDefault:        false,
-		showAllVPAs:        false,
+		Port:               8080,
+		BasePath:           "/",
+		VpaLabels:          utils.VPALabels,
+		ExcludedContainers: sets.Set[string]{},
+		OnByDefault:        false,
+		ShowAllVPAs:        false,
+		EnableCost:         true,
 	}
 }
 
 // OnPort is an Option for running the dashboard on a different port
 func OnPort(port int) Option {
 	return func(opts *Options) {
-		opts.port = port
+		opts.Port = port
 	}
 }
 
 // ExcludeContainers is an Option for excluding containers in the dashboard summary
 func ExcludeContainers(excludedContainers sets.Set[string]) Option {
 	return func(opts *Options) {
-		opts.excludedContainers = excludedContainers
+		opts.ExcludedContainers = excludedContainers
 	}
 }
 
 // ForVPAsWithLabels Option for limiting the dashboard to certain VPAs matching the labels
 func ForVPAsWithLabels(vpaLabels map[string]string) Option {
 	return func(opts *Options) {
-		opts.vpaLabels = vpaLabels
+		opts.VpaLabels = vpaLabels
 	}
 }
 
 // OnByDefault is an option for listing all namespaces in the dashboard unless explicitly excluded
 func OnByDefault(onByDefault bool) Option {
 	return func(opts *Options) {
-		opts.onByDefault = onByDefault
+		opts.OnByDefault = onByDefault
 	}
 }
 
 func ShowAllVPAs(showAllVPAs bool) Option {
 	return func(opts *Options) {
-		opts.showAllVPAs = showAllVPAs
+		opts.ShowAllVPAs = showAllVPAs
 	}
 }
 
 func BasePath(basePath string) Option {
 	return func(opts *Options) {
-		opts.basePath = basePath
+		opts.BasePath = basePath
 	}
 }
 
 func InsightsHost(insightsHost string) Option {
 	return func(opts *Options) {
-		opts.insightsHost = insightsHost
+		opts.InsightsHost = insightsHost
+	}
+}
+
+func EnableCost(enableCost bool) Option {
+	return func(opts *Options) {
+		opts.EnableCost = enableCost
 	}
 }
diff --git a/pkg/dashboard/router.go b/pkg/dashboard/router.go
@@ -50,7 +50,7 @@ func GetRouter(setters ...Option) *mux.Router {
 		setter(opts)
 	}
 
-	router := mux.NewRouter().PathPrefix(opts.basePath).Subrouter()
+	router := mux.NewRouter().PathPrefix(opts.BasePath).Subrouter()
 
 	// health
 	router.Handle("/health", Health("OK"))
@@ -59,7 +59,7 @@ func GetRouter(setters ...Option) *mux.Router {
 	// assets
 	router.Handle("/favicon.ico", Asset("/images/favicon-32x32.png"))
 	fileServer := http.FileServer(GetAssetBox())
-	router.PathPrefix("/static/").Handler(http.StripPrefix(path.Join(opts.basePath, "/static/"), fileServer))
+	router.PathPrefix("/static/").Handler(http.StripPrefix(path.Join(opts.BasePath, "/static/"), fileServer))
 
 	// dashboard
 	router.Handle("/dashboard", Dashboard(*opts))
@@ -71,15 +71,15 @@ func GetRouter(setters ...Option) *mux.Router {
 	// root
 	router.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		// catch all other paths that weren't matched
-		if r.URL.Path != "/" && r.URL.Path != opts.basePath && r.URL.Path != opts.basePath+"/" {
+		if r.URL.Path != "/" && r.URL.Path != opts.BasePath && r.URL.Path != opts.BasePath+"/" {
 			klog.Infof("404: %s", r.URL.Path)
 			http.NotFound(w, r)
 			return
 		}
 
-		klog.Infof("redirecting to %v", path.Join(opts.basePath, "/namespaces"))
+		klog.Infof("redirecting to %v", path.Join(opts.BasePath, "/namespaces"))
 		// default redirect on root path
-		http.Redirect(w, r, path.Join(opts.basePath, "/namespaces"), http.StatusMovedPermanently)
+		http.Redirect(w, r, path.Join(opts.BasePath, "/namespaces"), http.StatusMovedPermanently)
 	})
 
 	// api
diff --git a/pkg/dashboard/templates.go b/pkg/dashboard/templates.go
@@ -104,7 +104,7 @@ func writeTemplate(tmpl *template.Template, opts Options, data interface{}, w ht
 		return
 	}
 	err = tmpl.Execute(buf, baseTemplateData{
-		BasePath: validateBasePath(opts.basePath),
+		BasePath: validateBasePath(opts.BasePath),
 		Data:     data,
 		JSON:     template.JS(jsonData),
 	})
diff --git a/pkg/dashboard/templates/dashboard.gohtml b/pkg/dashboard/templates/dashboard.gohtml
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  {{ template "head" . }}
+  {{ template "head" .Data }}
 
   {{ if gt (len .Data.VpaData.Namespaces) 1 }}
   <script src="static/js/filter.js" type="module"></script>
-  {{ end }}
+ 
 
   <noscript>
     <style>
@@ -16,12 +16,15 @@
   </noscript>
 
   <script>
-    window.INSIGHTS_HOST = "{{ .Data.InsightsHost }}"
+    window.INSIGHTS_HOST = "{{ .Data.Opts.InsightsHost }}"
   </script>
+  {{ end }}
 
+  {{- if .Data.Opts.EnableCost }}
   <script defer src="static/js/email.js"></script>
   <script defer src="static/js/api-token.js"></script>
   <script defer src="static/js/cost_settings.js"></script>
+  {{- end }}
 </head>
 
 <body class="layoutSidebar">
@@ -31,9 +34,12 @@
 
   <div class="layoutSidebar__main">
     <main class="verticalRhythm --rhythm-3">
+
+      {{- if .Data.Opts.EnableCost }}
       {{ template "email" . }}
       {{ template "api_token" . }}
       {{ template "cost_settings" . }}
+      {{- end }}
 
       <h1>Namespace Details</h1>
 
diff --git a/pkg/dashboard/templates/filter.gohtml b/pkg/dashboard/templates/filter.gohtml
@@ -1,6 +1,6 @@
 {{ define "filter" }}
 <noscript>
-    <p class="controls">{{ len . }} namespaces found</p>
+    <p class="controls">{{ len .Namespaces }} namespaces found</p>
 </noscript>
 
 <form
@@ -31,7 +31,7 @@
         3. An output that's always shown visually. We have to remove content from the above two to get them to announce the same content back to back. This would make the words pop in and out visually.
       Note that the elements used for dynamic screen reader announcements can't themselves be injected or they won't work. Must be pre-existing containers into which the announcment content is injected. 
     -->
-    {{ with $initialStatus := (len .) | printf "%d total namespaces found" }}
+    {{ with $initialStatus := (len .Namespaces) | printf "%d total namespaces found" }}
     <div class="control-block">
         <output aria-hidden="true">{{ $initialStatus }}</output>
         <output class="visually-hidden" aria-live="polite">{{ $initialStatus }}</output>
diff --git a/pkg/dashboard/templates/head.gohtml b/pkg/dashboard/templates/head.gohtml
@@ -1,5 +1,5 @@
 {{ define "head" }}
-<base href="{{ .BasePath }}">
+<base href="{{ .Opts.BasePath }}">
 <meta charset="utf-8" />
 <title>Goldilocks by Fairwinds</title>
 <meta
@@ -17,8 +17,11 @@
 <link rel="stylesheet" href="static/css/utopia.css" />
 <link rel="stylesheet" href="static/css/main.css" />
 <link rel="stylesheet" href="static/css/fontawesome-5.7.2.css" />
-<link rel="stylesheet" href="static/css/prism.css" />
 
+{{- if .Opts.EnableCost }}
+<link rel="stylesheet" href="static/css/prism.css" />
 <script src="static/js/main.js" type="module"></script>
 <script defer src="static/js/prism.js"></script>
+{{- end }}
+
 {{ end }}
diff --git a/pkg/dashboard/templates/namespace_list.gohtml b/pkg/dashboard/templates/namespace_list.gohtml
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en-US">
 <head>
-  {{ template "head" . }}
+  {{ template "head" .Data }}
 
-  {{ if gt (len .Data) 1 }}
+  {{ if gt (len .Data.Namespaces ) 1 }}
   <script src="static/js/filter.js" type="module"></script>
   {{ end }}
 </head>
@@ -17,16 +17,16 @@
     <main class="verticalRhythm">
       <h1>Namespaces</h1>
 
-      {{ if lt (len .Data) 1 }}
+      {{ if lt (len .Data.Namespaces) 1 }}
       <p>No namespaces are labelled for use by Goldilocks. Try labelling one with <code class="language-shell">kubectl label ns NAMESPACE_NAME goldilocks.fairwinds.com/enabled=true</code></p>
 
       {{ else }}
-        {{ if gt (len .Data) 1 }}
+        {{ if gt (len .Data.Namespaces) 1 }}
           {{ template "filter" .Data }}
         {{ end }}
 
       <ul aria-live="off" class="namespaceList" id="js-filter-container" role="list">
-        {{ range .Data }}
+        {{ range .Data.Namespaces }}
         <li data-filter="{{ .Name }}">
           <a class="buttonLink --withIcon" href="{{ $.BasePath }}dashboard/{{ .Name }}">
             {{ .Name }}
diff --git a/pkg/summary/options.go b/pkg/summary/options.go
@@ -10,25 +10,25 @@ type Option func(*options)
 
 // options for getting and caching the Summarizer's VPAs
 type options struct {
-	kubeClient         *kube.ClientInstance
-	vpaClient          *kube.VPAClientInstance
-	dynamicClient      *kube.DynamicClientInstance
+	kubeClient            *kube.ClientInstance
+	vpaClient             *kube.VPAClientInstance
+	dynamicClient         *kube.DynamicClientInstance
 	controllerUtilsClient *kube.ControllerUtilsClientInstance
-	namespace          string
-	vpaLabels          map[string]string
-	excludedContainers sets.Set[string]
+	namespace             string
+	vpaLabels             map[string]string
+	excludedContainers    sets.Set[string]
 }
 
 // defaultOptions for a Summarizer
 func defaultOptions() *options {
 	return &options{
-		kubeClient:         kube.GetInstance(),
-		vpaClient:          kube.GetVPAInstance(),
-		dynamicClient:      kube.GetDynamicInstance(),
+		kubeClient:            kube.GetInstance(),
+		vpaClient:             kube.GetVPAInstance(),
+		dynamicClient:         kube.GetDynamicInstance(),
 		controllerUtilsClient: kube.GetControllerUtilsInstance(),
-		namespace:          namespaceAllNamespaces,
-		vpaLabels:          utils.VPALabels,
-		excludedContainers: sets.Set[string]{},
+		namespace:             namespaceAllNamespaces,
+		vpaLabels:             utils.VPALabels,
+		excludedContainers:    sets.Set[string]{},
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,69 +10,77 @@ type Option func(*Options)`
`10`	`10`
`11`	`11`	`// Options are options for getting and caching the Summarizer's VPAs`
`12`	`12`	`type Options struct {`
`13`		`- port int`
`14`		`- basePath string`
`15`		`- vpaLabels map[string]string`
`16`		`- excludedContainers sets.Set[string]`
`17`		`- onByDefault bool`
`18`		`- showAllVPAs bool`
`19`		`- insightsHost string`
	`13`	`+ Port int`
	`14`	`+ BasePath string`
	`15`	`+ VpaLabels map[string]string`
	`16`	`+ ExcludedContainers sets.Set[string]`
	`17`	`+ OnByDefault bool`
	`18`	`+ ShowAllVPAs bool`
	`19`	`+ InsightsHost string`
	`20`	`+ EnableCost bool`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`// default options for the dashboard`
`23`	`24`	`func defaultOptions() *Options {`
`24`	`25`	`return &Options{`
`25`		`- port: 8080,`
`26`		`- basePath: "/",`
`27`		`- vpaLabels: utils.VPALabels,`
`28`		`- excludedContainers: sets.Set[string]{},`
`29`		`- onByDefault: false,`
`30`		`- showAllVPAs: false,`
	`26`	`+ Port: 8080,`
	`27`	`+ BasePath: "/",`
	`28`	`+ VpaLabels: utils.VPALabels,`
	`29`	`+ ExcludedContainers: sets.Set[string]{},`
	`30`	`+ OnByDefault: false,`
	`31`	`+ ShowAllVPAs: false,`
	`32`	`+ EnableCost: true,`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`
`34`	`36`	`// OnPort is an Option for running the dashboard on a different port`
`35`	`37`	`func OnPort(port int) Option {`
`36`	`38`	`return func(opts *Options) {`
`37`		`- opts.port = port`
	`39`	`+ opts.Port = port`
`38`	`40`	`}`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`// ExcludeContainers is an Option for excluding containers in the dashboard summary`
`42`	`44`	`func ExcludeContainers(excludedContainers sets.Set[string]) Option {`
`43`	`45`	`return func(opts *Options) {`
`44`		`- opts.excludedContainers = excludedContainers`
	`46`	`+ opts.ExcludedContainers = excludedContainers`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`// ForVPAsWithLabels Option for limiting the dashboard to certain VPAs matching the labels`
`49`	`51`	`func ForVPAsWithLabels(vpaLabels map[string]string) Option {`
`50`	`52`	`return func(opts *Options) {`
`51`		`- opts.vpaLabels = vpaLabels`
	`53`	`+ opts.VpaLabels = vpaLabels`
`52`	`54`	`}`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`// OnByDefault is an option for listing all namespaces in the dashboard unless explicitly excluded`
`56`	`58`	`func OnByDefault(onByDefault bool) Option {`
`57`	`59`	`return func(opts *Options) {`
`58`		`- opts.onByDefault = onByDefault`
	`60`	`+ opts.OnByDefault = onByDefault`
`59`	`61`	`}`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`func ShowAllVPAs(showAllVPAs bool) Option {`
`63`	`65`	`return func(opts *Options) {`
`64`		`- opts.showAllVPAs = showAllVPAs`
	`66`	`+ opts.ShowAllVPAs = showAllVPAs`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`func BasePath(basePath string) Option {`
`69`	`71`	`return func(opts *Options) {`
`70`		`- opts.basePath = basePath`
	`72`	`+ opts.BasePath = basePath`
`71`	`73`	`}`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`func InsightsHost(insightsHost string) Option {`
`75`	`77`	`return func(opts *Options) {`
`76`		`- opts.insightsHost = insightsHost`
	`78`	`+ opts.InsightsHost = insightsHost`
	`79`	`+ }`
	`80`	`+}`
	`81`	`+`
	`82`	`+func EnableCost(enableCost bool) Option {`
	`83`	`+ return func(opts *Options) {`
	`84`	`+ opts.EnableCost = enableCost`
`77`	`85`	`}`
`78`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func writeTemplate(tmpl *template.Template, opts Options, data interface{}, w ht`
`104`	`104`	`return`
`105`	`105`	`}`
`106`	`106`	`err = tmpl.Execute(buf, baseTemplateData{`
`107`		`- BasePath: validateBasePath(opts.basePath),`
	`107`	`+ BasePath: validateBasePath(opts.BasePath),`
`108`	`108`	`Data: data,`
`109`	`109`	`JSON: template.JS(jsonData),`
`110`	`110`	`})`