Merge pull request #1 from HaveFun83/use-ingress-default-syntax

changed ingress values to more configurable syntax

Author: a60814billy

README.md

@@ -10,6 +10,9 @@ This repository contains helm chart for CodiMD.
 ## Install
 
 ```bash
-helm repo add codimd ......... (TBD)
-helm install codimd codimd/codimd
-```
+helm repo add codimd https://helm.codimd.dev/
+helm install my-release codimd/codimd
+```
+
+## Documentation
+[charts/codimd/README.md](./charts/codimd/README.md)

charts/codimd/Chart.yaml

@@ -18,7 +18,7 @@ kubeVersion: ">=1.14.0-0"
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.5
+version: 0.1.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

charts/codimd/README.md

@@ -68,10 +68,10 @@ If you want use ingress, please set `service.type` to be `ClusterIP`
 | service.port                  | Service HTTP port                     | `80`           |
 | service.externalTrafficPolicy | Service externalTrafficPolicy         | `nil`           |
 | service.loadBalancerIP        | Service loadBalancerIP                | `nil`           |
-| ingress.enabled               | Enable ingress controller resource    | `false`        |
-| ingress.annotation            | Ingress annotations                   | `nil`          |
-| ingress.hostname              | Default host for the ingress resource | `nil`          |
-| ingress.tlsSecret             | TLS Secret Name                       | `nil`          |
+| ingress.enabled               | If `true` Ingress will be created     | `false`        |
+| ingress.annotations           | Ingress annotations                   | `nil`          |
+| ingress.hosts                 | Ingress hostnames                     | `nil`          |
+| ingress.tls                   | Ingress TLS configuration (YAML)      | `nil`          |
 
 
 ### CodiMD common parameters

charts/codimd/templates/ingress.yaml

@@ -1,24 +1,41 @@
-{{ if .Values.ingress.enabled }}
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "codimd.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
-  name: {{ template "codimd.fullname" . }}
-  {{ if .Values.ingress.annotation}}
+  name: {{ $fullName }}
+  labels:
+    {{- include "codimd.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
   annotations:
-    {{ toYaml .Values.ingress.annotation | nindent 4 }}
-  {{ end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
   rules:
-    - host: {{ .Values.ingress.hostname }}
+  {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
       http:
         paths:
-          - backend:
-              serviceName: {{ template "codimd.fullname" . }}
-              servicePort: 80
-  {{ if .Values.ingress.tlsSecret }}
-  tls:
-    - hosts:
-        - {{ .Values.ingress.hostname }}
-      secretName: {{ .Values.ingress.tlsSecret }}
-  {{ end }}
-  {{ end }}
+        {{- range .paths }}
+          - path: {{ . }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+        {{- end }}
+  {{- end }}
+{{- end }}

charts/codimd/values.yaml

@@ -67,9 +67,18 @@ service:
 ##
 ingress:
   enabled: false
-  # annotation:
-  # hostname:
-  # tlsSecret:
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+      - /
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
 
 ##
 ## CodiMD application configuration