Allow setting an ingress class name on the ingress (#24)

chartmuseum · Oct 15, 2021 · 73cbd59 · 73cbd59
1 parent 5e866d1
commit 73cbd59
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/src/chartmuseum/Chart.yaml b/src/chartmuseum/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Host your own Helm Chart Repository
 name: chartmuseum
-version: 3.2.0
+version: 3.3.0
 appVersion: 0.13.1
 home: https://github.com/helm/chartmuseum
 icon: https://raw.githubusercontent.com/chartmuseum/charts/main/logo.jpg

diff --git a/src/chartmuseum/README.md b/src/chartmuseum/README.md
@@ -199,6 +199,7 @@ their default values. See values.yaml for all available options.
 | `ingress.enabled`                       | Enable ingress controller resource                                          | `false`                              |
 | `ingress.annotations`                   | Ingress annotations                                                         | `{}`                                 |
 | `ingress.labels`                        | Ingress labels                                                              | `{}`                                 |
+| `ingress.ingressClassName`              | Ingress class name for Kubernetes 1.18 and above                            | `<nil>`                              |
 | `ingress.hosts[0].name`                 | Hostname for the ingress                                                    | `<nil>`                              |
 | `ingress.hosts[0].path`                 | Path within the url structure                                               | `/`                                  |
 | `ingress.hosts[0].tls `                 | Enable TLS on the ingress host                                              | `false`                              |

diff --git a/src/chartmuseum/templates/ingress.yaml b/src/chartmuseum/templates/ingress.yaml
@@ -23,6 +23,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
   - host: {{ .name }}

diff --git a/src/chartmuseum/values.yaml b/src/chartmuseum/values.yaml
@@ -290,6 +290,10 @@ ingress:
     #   ## Secrets must be added manually to the namespace
     #   tlsSecret: chartmuseum.domain2-tls
 
+  # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
+  # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
+  ingressClassName:
+
 # Adding secrets to tiller is not a great option, so If you want to use an existing
 # secret that contains the json file, you can use the following entries
 gcp: