pkg/headlamp: make ingress optional and set default values

kinvolk · Sep 30, 2020 · 1d30f40 · 1d30f40
1 parent 8083431
commit 1d30f40
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pkg/components/headlamp/component.go b/pkg/components/headlamp/component.go
@@ -50,7 +50,15 @@ func (c *component) LoadConfig(configBody *hcl.Body, evalContext *hcl.EvalContex
 		}
 	}
 
-	return gohcl.DecodeBody(*configBody, evalContext, c)
+	if err := gohcl.DecodeBody(*configBody, evalContext, c); err != nil {
+		return err
+	}
+
+	if c.Ingress != nil {
+		c.Ingress.SetDefaults()
+	}
+
+	return nil
 }
 
 // RenderManifests renders the Helm chart templates with values provided.

diff --git a/pkg/components/headlamp/template.go b/pkg/components/headlamp/template.go
@@ -21,6 +21,7 @@ image:
   # TODO use v0.1.0 when it's released
   tag: l8e
   pullPolicy: Always
+{{ if .Ingress }}
 ingress:
   enabled: true
   hosts:
@@ -35,4 +36,5 @@ ingress:
     kubernetes.io/ingress.class: {{ .Ingress.Class }}
     cert-manager.io/cluster-issuer: {{ .Ingress.CertManagerClusterIssuer }}
     contour.heptio.com/websocket-routes: "/"
+{{ end }}
 `