diff --git a/apm-server/templates/ingress.yaml b/apm-server/templates/ingress.yaml index 64ebcced9..f28bdb99a 100644 --- a/apm-server/templates/ingress.yaml +++ b/apm-server/templates/ingress.yaml @@ -2,7 +2,7 @@ {{- $fullName := include "apm.fullname" . -}} {{- $servicePort := .Values.service.port -}} {{- $ingressPath := .Values.ingress.path -}} -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "apm.fullname" . }} @@ -27,8 +27,11 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: ImplementationSpecific backend: - serviceName: {{ $fullName }} - servicePort: {{ $servicePort }} + service: + name: {{ $fullName }} + port: + number: {{ $servicePort }} {{- end }} {{- end }} diff --git a/elasticsearch/templates/ingress.yaml b/elasticsearch/templates/ingress.yaml index bcb2befa6..82ea7ca61 100644 --- a/elasticsearch/templates/ingress.yaml +++ b/elasticsearch/templates/ingress.yaml @@ -2,7 +2,7 @@ {{- $fullName := include "elasticsearch.uname" . -}} {{- $httpPort := .Values.httpPort -}} {{- $ingressPath := .Values.ingress.path -}} -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $fullName }} @@ -36,18 +36,24 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: ImplementationSpecific backend: - serviceName: {{ $fullName }} - servicePort: {{ $httpPort }} + service: + name: {{ $fullName }} + port: + number: {{ $httpPort }} {{- else }} - host: {{ .host }} http: paths: {{- range .paths }} - path: {{ .path }} + pathType: ImplementationSpecific backend: - serviceName: {{ $fullName }} - servicePort: {{ .servicePort | default $httpPort }} + service: + name: {{ $fullName }} + port: + number: {{ .servicePort | default $httpPort }} {{- end }} {{- end }} {{- end }} diff --git a/kibana/templates/ingress.yaml b/kibana/templates/ingress.yaml index f79255f30..53d2c4374 100644 --- a/kibana/templates/ingress.yaml +++ b/kibana/templates/ingress.yaml @@ -2,7 +2,7 @@ {{- $fullName := include "kibana.fullname" . -}} {{- $httpPort := .Values.httpPort -}} {{- $ingressPath := .Values.ingress.path -}} -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $fullName }} @@ -33,18 +33,24 @@ spec: http: paths: - path: {{ $ingressPath }} + pathType: ImplementationSpecific backend: - serviceName: {{ $fullName }} - servicePort: {{ $httpPort }} + service: + name: {{ $fullName }} + port: + number: {{ $httpPort }} {{- else }} - host: {{ .host }} http: paths: {{- range .paths }} - path: {{ .path }} + pathType: ImplementationSpecific backend: - serviceName: {{ $fullName }} - servicePort: {{ .servicePort | default $httpPort }} + service: + name: {{ $fullName }} + port: + number: {{ .servicePort | default $httpPort }} {{- end }} {{- end }} {{- end }} diff --git a/logstash/templates/ingress.yaml b/logstash/templates/ingress.yaml index a4aeb145e..620bd9581 100644 --- a/logstash/templates/ingress.yaml +++ b/logstash/templates/ingress.yaml @@ -1,6 +1,6 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "logstash.fullname" . -}} -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $fullName }} @@ -25,9 +25,12 @@ spec: paths: {{- range .paths }} - path: {{ .path }} + pathType: ImplementationSpecific backend: - serviceName: {{ $fullName }} - servicePort: {{ .servicePort }} + service: + name: {{ $fullName }} + port: + number: {{ .servicePort }} {{- end }} {{- end }} {{- end }}