Add values templating in ingresses (#13)

nixys#15
evgkrsk · Jul 16, 2022 · 87fae46 · 87fae46
1 parent e5d24b6
commit 87fae46
Show file tree

Hide file tree

Showing 6 changed files with 144 additions and 3 deletions.
diff --git a/charts/universal-chart/CHANGELOG.md b/charts/universal-chart/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## 3.4.2 - Jul 16, 2022
+* fix: add values templating in ingresses
+
 ## 3.4.1 - Jul 3, 2022
 * fix: bool variables quoting in configmaps
 * fix: set up valid default schedule for cronjobs

diff --git a/charts/universal-chart/Chart.yaml b/charts/universal-chart/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Nixys universal Helm chart for deploy your apps to Kubernetes
 name: universal-chart
-version: 3.4.1
+version: 3.4.2
 maintainers:
 - name: Roman Andreev
   email: [email protected]

diff --git a/charts/universal-chart/README.md b/charts/universal-chart/README.md
@@ -571,3 +571,10 @@ or
 ```bash
 --set-file "secrets.json-file.data.file\.json=path/to/file.json"
 ```
+
+### Values Templating features
+
+You can use go-templates as part of your values.
+
+> **Note**
+> Use single quotes to escape strings containing templates to avoid manifest generation errors.
diff --git a/charts/universal-chart/results/ingress-rendering.yaml b/charts/universal-chart/results/ingress-rendering.yaml
@@ -0,0 +1,97 @@
+---
+# Source: universal-chart/templates/deployment.yml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: test-someapi
+  namespace: default
+  labels:
+    app.kubernetes.io/name: test
+    app.kubernetes.io/instance: test
+    app.kubernetes.io/managed-by: Helm
+  annotations:    
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: test
+      app.kubernetes.io/instance: test
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: test
+        app.kubernetes.io/instance: test
+      annotations:
+    spec:
+      affinity:
+        nodeAffinity:
+          {}
+        podAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchLabels:
+                  app.kubernetes.io/name: test
+                  app.kubernetes.io/instance: test
+              namespaces:
+              - "default"
+              topologyKey: kubernetes.io/hostname
+            weight: 1
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchLabels:
+                  app.kubernetes.io/name: test
+                  app.kubernetes.io/instance: test
+              namespaces:
+              - "default"
+              topologyKey: kubernetes.io/hostname
+            weight: 1
+
+      containers:
+      - name: some-api
+        image: nginx:latest
+        imagePullPolicy: IfNotPresent        
+        env:
+        - name: PUBLIC_URL
+          value: https://api.dev2.somedomain.ru        
+        ports:
+        - containerPort: 1337
+          name: http
+        volumeMounts:
+
+          []
+      volumes:      
+        []
+---
+# Source: universal-chart/templates/ingress.yml
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: test-someApiIngress
+  namespace: "default"
+  labels:
+    app.kubernetes.io/name: test
+    app.kubernetes.io/instance: test
+    app.kubernetes.io/managed-by: Helm
+  annotations:    
+    kubernetes.io/tls-acme: "true"
+    cert-manager.io/cluster-issuer: letsencrypt
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+spec:
+  rules:
+  - host: api.dev2.somedomain.ru
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: test-some-api-svc
+            port:
+              name: http
+  tls:
+  - hosts:
+    - api.dev2.somedomain.ru
+    secretName: test-someApiIngress-tls
diff --git a/charts/universal-chart/samples/ingress-rendering.yaml b/charts/universal-chart/samples/ingress-rendering.yaml
@@ -0,0 +1,26 @@
+defaultURL: "api.dev2.somedomain.ru"
+
+deployments:
+  someApi:
+    replicas: 1
+    containers:
+    - name: some-api
+      ports:
+      - name: http
+        containerPort: 1337
+      env:
+        - name: PUBLIC_URL
+          value: 'https://{{ .Values.defaultURL }}'
+
+ingresses:
+  someApiIngress:
+    annotations:
+      nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    certManager:
+      issuerType: cluster-issuer
+      issuerName: letsencrypt
+    hosts:
+    - hostname: '{{ .Values.defaultURL }}'
+      paths:
+      - serviceName: some-api-svc
+        servicePort: http
diff --git a/charts/universal-chart/templates/ingress.yml b/charts/universal-chart/templates/ingress.yml
@@ -23,7 +23,11 @@ spec:
   {{- end }}
   rules:
   {{- range $ing.hosts }}
-  - host: {{ default $host .hostname }}
+  {{- if .hostname }}
+  - host: {{ include "helpers.tplvalues.render" (dict "value" .hostname "context" $)}}
+  {{- else }}
+  - host: {{ $host }}
+  {{- end }}
     http:
       paths:
       {{- range .paths }}
@@ -40,7 +44,11 @@ spec:
   {{- if $ing.certManager }}
   - hosts:
     {{- range $ing.hosts }}
-    - {{ default $host .hostname }}
+    {{- if .hostname }}
+    - {{ include "helpers.tplvalues.render" (dict "value" .hostname "context" $)}}
+    {{- else }}
+    - {{ $host }}
+    {{- end }}
     {{- end }}
     secretName: {{ .tlsName | default (include "helpers.app.fullname" (dict "name" ($ing.name | default $host) "context" $)) }}-tls
   {{- end }}