Merge branch 'master' into master

Changelog.md

@@ -16,6 +16,7 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Changed
  * Allow setting pod security context when deploying with Helm
  * Use [distroless](https://github.com/GoogleContainerTools/distroless) as base image for orchestrator container
+ * Use networking.k8s.io/v1 instead of extensions/v1beta1 for ingress
 ### Removed
 ### Fixed
 

deploy/charts/mysql-operator/templates/orc-ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.orchestrator.ingress.enabled -}}
 {{- $fullName := include "mysql-operator.fullname" . -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -11,6 +11,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
   {{- if .Values.orchestrator.ingress.tls }}
   tls:
   {{- range .Values.orchestrator.ingress.tls }}
@@ -28,9 +31,12 @@ spec:
       paths:
       {{- range .paths }}
       - path: {{ . }}
+        pathType: Prefix
         backend:
-          serviceName: {{ $fullName }}
-          servicePort: http
+          service:
+            name: {{ $fullName }}
+            port: 
+              name: http
     {{- end }}
   {{- end }}
 {{- end }}

deploy/charts/mysql-operator/values.yaml

@@ -126,6 +126,11 @@ orchestrator:
     #    hosts:
     #      - chart-example.local
 
+    ## If defined set the `ingressClassName`. If unset the default ingress class
+    ## (https://kubernetes.io/docs/concepts/services-networking/ingress/#default-ingress-class)
+    ## will be used. Mutually exlusive with annotation `kubernetes.io/ingress.class`
+    # className: nginx
+
   persistence:
     enabled: true
     ## If defined, storageClassName: <storageClass>