Merge pull request #6 from p1nkun1c0rns/IngressClassName

add ingressclassname
p1nkun1c0rns · Nov 3, 2021 · 6fee667 · 6fee667
2 parents 7dd5291 + c9bfd0e
commit 6fee667
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/charts/gcppromd/Chart.yaml b/charts/gcppromd/Chart.yaml
@@ -9,5 +9,5 @@ maintainers:
   name: steinbrueckri
 type: application
 
-version: v1.0.2
+version: v1.0.3
 appVersion: "v0.4.0"
diff --git a/charts/gcppromd/README.md b/charts/gcppromd/README.md
@@ -1,6 +1,6 @@
 # gcppromd
 
-![Version: v1.0.1](https://img.shields.io/badge/Version-v1.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.0](https://img.shields.io/badge/AppVersion-v0.4.0-informational?style=flat-square)
+![Version: v1.0.3](https://img.shields.io/badge/Version-v1.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.0](https://img.shields.io/badge/AppVersion-v0.4.0-informational?style=flat-square)
 
 A Helm chart for gcppromd
 

diff --git a/charts/prometheus-net-discovery/Chart.yaml b/charts/prometheus-net-discovery/Chart.yaml
@@ -10,5 +10,5 @@ maintainers:
   name: steinbrueckri
 type: application
 
-version: v1.3.5
+version: v1.3.6
 appVersion: "v1.3.3"
diff --git a/charts/prometheus-net-discovery/README.md b/charts/prometheus-net-discovery/README.md
@@ -1,6 +1,6 @@
 # prometheus-net-discovery
 
-![Version: v1.3.4](https://img.shields.io/badge/Version-v1.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.3](https://img.shields.io/badge/AppVersion-v1.3.3-informational?style=flat-square)
+![Version: v1.3.6](https://img.shields.io/badge/Version-v1.3.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.3](https://img.shields.io/badge/AppVersion-v1.3.3-informational?style=flat-square)
 
 A Helm chart for prometheus-net-discovery
 

diff --git a/charts/theo/Chart.yaml b/charts/theo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.3.0"
 description: A Helm chart for Theo
 name: theo
-version: 0.1.2
+version: 0.1.3
 maintainers:
 - email: [email protected]
   name: steinbrueckri
diff --git a/charts/theo/README.md b/charts/theo/README.md
@@ -1,6 +1,6 @@
 # theo
 
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
 
 A Helm chart for Theo
 
@@ -44,6 +44,7 @@ A Helm chart for Theo
 | service.port | int | `80` |  |
 | ingress.enabled | bool | `false` | Enable ingress |
 | ingress.annotations | object | `{}` | The annotations to be applied to ingress |
+| ingress.ingressClassName | string | `""` |  |
 | ingress.paths | list | `[]` |  |
 | ingress.hosts[0] | string | `"theo.example.org"` |  |
 | ingress.tls | list | `[]` |  |

diff --git a/charts/theo/templates/ingress.yaml b/charts/theo/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "theo.fullname" . -}}
 {{- $ingressPaths := .Values.ingress.paths -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -15,6 +15,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  ingressClassName: {{ .Values.ingress.className }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

diff --git a/charts/theo/values.yaml b/charts/theo/values.yaml
@@ -63,7 +63,7 @@ ingress:
   enabled: false
   # ingress.annotations -- The annotations to be applied to ingress
   annotations: {}
-    # kubernetes.io/ingress.class: nginx
+  ingressClassName: ""
     # kubernetes.io/tls-acme: "true"
   paths: []
   hosts: