Adding support to kubernetes ingress v1 & ClassName

apm-server/templates/ingress.yaml

@@ -13,6 +13,10 @@ metadata:
     {{- range $key, $value := .Values.labels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
   {{- if .Values.ingress.className }}
   ingressClassName: {{ .Values.ingress.className | quote }}

apm-server/values.yaml

@@ -158,8 +158,8 @@ autoscaling:
   averageCpuUtilization: 50
 
 ingress:
-  enabled: true
-  className: ""
+  enabled: false
+  className: "nginx"
   pathtype: ImplementationSpecific
   annotations: {}
     # kubernetes.io/ingress.class: nginx

elasticsearch/templates/ingress.yaml

@@ -3,22 +3,20 @@
 {{- $httpPort := .Values.httpPort -}}
 {{- $pathtype := .Values.ingress.pathtype -}}
 {{- $ingressPath := .Values.ingress.path -}}
-{{- if semverCompare "<1.19-0" .Capabilities.KubeVersion.Version }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else }}
 apiVersion: networking.k8s.io/v1
-{{- end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
     app: {{ .Chart.Name }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
-  {{- if .Values.ingress.className }}
   ingressClassName: {{ .Values.ingress.className | quote }}
-  {{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- if .ingressPath }}

elasticsearch/values.yaml

@@ -245,6 +245,8 @@ tolerations: []
 # Only enable this if you have security enabled on your cluster
 ingress:
   enabled: false
+  className: "nginx"
+  pathtype: ImplementationSpecific
   annotations: {}
   # kubernetes.io/ingress.class: nginx
   # kubernetes.io/tls-acme: "true"

kibana/templates/ingress.yaml

@@ -8,6 +8,10 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels: {{ include "kibana.labels" . | nindent 4 }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
   {{- if .Values.ingress.className }}
   ingressClassName: {{ .Values.ingress.className | quote }}

kibana/values.yaml

@@ -128,7 +128,7 @@ service:
 
 ingress:
   enabled: false
-  className: ""
+  className: "nginx"
   pathtype: ImplementationSpecific
   annotations: {}
     # kubernetes.io/ingress.class: nginx

logstash/templates/ingress.yaml

@@ -12,6 +12,10 @@ metadata:
     chart: "{{ .Chart.Name }}"
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
   {{- if .Values.ingress.className }}
   ingressClassName: {{ .Values.ingress.className | quote }}

logstash/values.yaml

@@ -270,7 +270,7 @@ service: {}
 
 ingress:
   enabled: false
-  className: ""
+  className: "nginx"
   pathtype: ImplementationSpecific
   hosts:
     - host: logstash-example.local