[all] Add support to ingress networking.k8s.io/v1 & ingressClassName (#…

…1409) (#1478) * Adding support to Ingress networking.k8s.io/v1 * Adjusting ES service name * Removing ingress typo & adjusting python test * Adjusting python tests to use the new ingress version * fixing conflict * Adding support to kubernetes ingress v1 & ClassName * Adding reformatted files * fixing conflict * Adding ClassName & Pathtype on ingress settings * Performing syntax adjustments and removing comments Co-authored-by: framsouza <[email protected]>
elastic · Dec 14, 2021 · 1459b2f · 1459b2f
1 parent c3b6fd1
commit 1459b2f
Show file tree

Hide file tree

Showing 11 changed files with 211 additions and 123 deletions.
diff --git a/apm-server/templates/ingress.yaml b/apm-server/templates/ingress.yaml
@@ -1,8 +1,9 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "apm.fullname" . -}}
 {{- $servicePort := .Values.service.port -}}
+{{- $pathtype := .Values.ingress.pathtype -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "apm.fullname" . }}
@@ -17,18 +18,24 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className | quote }}
+  {{- end }}
 {{- if .Values.ingress.tls }}
   tls:
 {{ toYaml .Values.ingress.tls | indent 4 }}
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
-    - host: {{ . }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $servicePort }}
+  - host: {{ . }}
+    http:
+      paths:
+      - path: {{ $ingressPath }}
+        pathType: {{ $pathtype }}
+        backend:
+          service:
+            name: {{ $fullName }}
+            port:
+              number: {{ $servicePort }}
   {{- end }}
 {{- end }}
diff --git a/apm-server/values.yaml b/apm-server/values.yaml
@@ -164,10 +164,11 @@ autoscaling:
 
 ingress:
   enabled: false
-  annotations:
-    {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
+  className: "nginx"
+  pathtype: ImplementationSpecific
+  annotations: {}
+  # kubernetes.io/ingress.class: nginx
+  # kubernetes.io/tls-acme: "true"
   path: /
   hosts:
     - chart-example.local

diff --git a/elasticsearch/templates/ingress.yaml b/elasticsearch/templates/ingress.yaml
@@ -1,8 +1,9 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "elasticsearch.uname" . -}}
 {{- $httpPort := .Values.httpPort -}}
+{{- $pathtype := .Values.ingress.pathtype -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -15,40 +16,49 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className | quote }}
+  {{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- if .ingressPath }}
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . }}
-      {{- end }}
-      secretName: {{ .secretName }}
+  {{- range  .Values.ingress.tls }}
+  - hosts:
+    {{- range  .hosts }}
+      - {{ . }}
     {{- end }}
-  {{- else }}
+    secretName: {{ .secretName }}
+  {{- end }}
+{{- else }}
 {{ toYaml .Values.ingress.tls | indent 4 }}
   {{- end }}
-{{- end }}
+{{- end}}
   rules:
   {{- range .Values.ingress.hosts }}
     {{- if $ingressPath }}
-    - host: {{ . }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $httpPort }}
-    {{- else }}
-    - host: {{ .host }}
-      http:
-        paths:
-        {{- range .paths }}
-          - path: {{ .path }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ .servicePort | default $httpPort }}
-        {{- end }}
-    {{- end }}
+  - host: {{ . }}
+    http:
+      paths:
+      - path: {{ $ingressPath }}
+        pathType: {{ $pathtype }}
+        backend:
+          service:
+            name: {{ $fullName }}
+            port:
+              number: {{ $httpPort }}
+  {{- else }}
+  - host: {{ .host }}
+    http:
+      paths:
+      {{- range .paths }}
+      - path: {{ .path }}
+        pathType: {{ $pathtype }}
+        backend:
+          service:
+            name: {{ $fullName }}
+            port:
+              number: {{ .servicePort | default $httpPort }}
+      {{- end }}
   {{- end }}
-{{- end }}
+ {{- end }}
+ {{- end }}
diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py
@@ -702,19 +702,31 @@ def test_adding_an_ingress_rule():
 
     assert i["rules"][0]["host"] == "elasticsearch.elastic.co"
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == uname
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 9200
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == uname
+    assert (
+        i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"]
+        == 9200
+    )
     assert i["rules"][1]["host"] == None
     assert i["rules"][1]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][1]["http"]["paths"][0]["backend"]["serviceName"] == uname
-    assert i["rules"][1]["http"]["paths"][0]["backend"]["servicePort"] == 9200
+    assert i["rules"][1]["http"]["paths"][0]["backend"]["service"]["name"] == uname
+    assert (
+        i["rules"][1]["http"]["paths"][0]["backend"]["service"]["port"]["number"]
+        == 9200
+    )
     assert i["rules"][1]["http"]["paths"][1]["path"] == "/mypath"
-    assert i["rules"][1]["http"]["paths"][1]["backend"]["serviceName"] == uname
-    assert i["rules"][1]["http"]["paths"][1]["backend"]["servicePort"] == 8888
+    assert i["rules"][1]["http"]["paths"][1]["backend"]["service"]["name"] == uname
+    assert (
+        i["rules"][1]["http"]["paths"][1]["backend"]["service"]["port"]["number"]
+        == 8888
+    )
     assert i["rules"][2]["host"] == "elasticsearch.hello.there"
     assert i["rules"][2]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][2]["http"]["paths"][0]["backend"]["serviceName"] == uname
-    assert i["rules"][2]["http"]["paths"][0]["backend"]["servicePort"] == 9999
+    assert i["rules"][2]["http"]["paths"][0]["backend"]["service"]["name"] == uname
+    assert (
+        i["rules"][2]["http"]["paths"][0]["backend"]["service"]["port"]["number"]
+        == 9999
+    )
 
 
 def test_adding_a_deprecated_ingress_rule():
@@ -740,8 +752,11 @@ def test_adding_a_deprecated_ingress_rule():
 
     assert i["rules"][0]["host"] == "elasticsearch.elastic.co"
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == uname
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 9200
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == uname
+    assert (
+        i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"]
+        == 9200
+    )
 
 
 def test_changing_the_protocol():

diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
@@ -242,10 +242,11 @@ tolerations: []
 # Only enable this if you have security enabled on your cluster
 ingress:
   enabled: false
-  annotations:
-    {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
+  annotations: {}
+  className: "nginx"
+  pathtype: ImplementationSpecific
+  # kubernetes.io/ingress.class: nginx
+  # kubernetes.io/tls-acme: "true"
   hosts:
     - host: chart-example.local
       paths:

diff --git a/kibana/templates/ingress.yaml b/kibana/templates/ingress.yaml
@@ -1,8 +1,9 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "kibana.fullname" . -}}
 {{- $httpPort := .Values.httpPort -}}
+{{- $pathtype := .Values.ingress.pathtype -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -12,6 +13,9 @@ metadata:
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className | quote }}
+  {{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- if .ingressPath }}
@@ -21,31 +25,37 @@ spec:
       - {{ . }}
     {{- end }}
     secretName: {{ .secretName }}
-    {{- end }}
-  {{- else }}
+  {{- end }}
+{{- else }}
 {{ toYaml .Values.ingress.tls | indent 4 }}
   {{- end }}
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
     {{- if $ingressPath }}
-    - host: {{ . }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $httpPort }}
-    {{- else }}
-    - host: {{ .host }}
-      http:
-        paths:
-        {{- range .paths }}
-          - path: {{ .path }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ .servicePort | default $httpPort }}
-        {{- end }}
-    {{- end }}
+  - host: {{ . }}
+    http:
+      paths:
+      - path: {{ $ingressPath }}
+        pathType: {{ $pathtype }}
+        backend:
+          service:
+            name: {{ $fullName }}
+            port: 
+              number: {{ $httpPort }}
+  {{- else }}
+  - host: {{ .host }}
+    http:
+      paths:
+      {{- range .paths }}
+      - path: {{ .path }}
+        pathType: {{ $pathtype }}
+        backend:
+          service:
+            name: {{ $fullName }}
+            port:
+              number: {{ .servicePort | default $httpPort }}
+      {{- end }}
   {{- end }}
-{{- end }}
+ {{- end }}
+ {{- end }}
diff --git a/kibana/tests/kibana_test.py b/kibana/tests/kibana_test.py
@@ -260,19 +260,31 @@ def test_adding_an_ingress_rule():
 
     assert i["rules"][0]["host"] == "kibana.elastic.co"
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 5601
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert (
+        i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"]
+        == 5601
+    )
     assert i["rules"][0]["http"]["paths"][1]["path"] == "/testpath"
-    assert i["rules"][0]["http"]["paths"][1]["backend"]["serviceName"] == name
-    assert i["rules"][0]["http"]["paths"][1]["backend"]["servicePort"] == 8888
+    assert i["rules"][0]["http"]["paths"][1]["backend"]["service"]["name"] == name
+    assert (
+        i["rules"][0]["http"]["paths"][1]["backend"]["service"]["port"]["number"]
+        == 8888
+    )
     assert i["rules"][1]["host"] == None
     assert i["rules"][1]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][1]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][1]["http"]["paths"][0]["backend"]["servicePort"] == 5601
+    assert i["rules"][1]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert (
+        i["rules"][1]["http"]["paths"][0]["backend"]["service"]["port"]["number"]
+        == 5601
+    )
     assert i["rules"][2]["host"] == "kibana.hello.there"
     assert i["rules"][2]["http"]["paths"][0]["path"] == "/mypath"
-    assert i["rules"][2]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][2]["http"]["paths"][0]["backend"]["servicePort"] == 9999
+    assert i["rules"][2]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert (
+        i["rules"][2]["http"]["paths"][0]["backend"]["service"]["port"]["number"]
+        == 9999
+    )
 
 
 def test_adding_a_deprecated_ingress_rule():
@@ -298,8 +310,11 @@ def test_adding_a_deprecated_ingress_rule():
 
     assert i["rules"][0]["host"] == "kibana.elastic.co"
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 5601
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert (
+        i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"]
+        == 5601
+    )
 
 
 def test_adding_an_ingress_rule_wildcard():
@@ -326,8 +341,11 @@ def test_adding_an_ingress_rule_wildcard():
 
     assert i["rules"][0]["host"] == "kibana.elastic.co"
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 5601
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert (
+        i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"]
+        == 5601
+    )
 
 
 def test_adding_a_deprecated_ingress_rule_wildcard():
@@ -353,8 +371,11 @@ def test_adding_a_deprecated_ingress_rule_wildcard():
 
     assert i["rules"][0]["host"] == "kibana.elastic.co"
     assert i["rules"][0]["http"]["paths"][0]["path"] == "/"
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["serviceName"] == name
-    assert i["rules"][0]["http"]["paths"][0]["backend"]["servicePort"] == 5601
+    assert i["rules"][0]["http"]["paths"][0]["backend"]["service"]["name"] == name
+    assert (
+        i["rules"][0]["http"]["paths"][0]["backend"]["service"]["port"]["number"]
+        == 5601
+    )
 
 
 def test_override_the_default_update_strategy():