Skip to content
This repository was archived by the owner on May 16, 2023. It is now read-only.

Update apiVersion to networking.k8s.io/v1 on ingress resources #1233

Closed
javipolo wants to merge 2 commits into from
Closed

Update apiVersion to networking.k8s.io/v1 on ingress resources #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dff53c
Update apiVersion to networking.k8s.io/v1 on ingress resources
javipolo May 31, 2021
eb1e2e5
Update ingress rules section to comply with newer apiVersion
javipolo Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions apm-server/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" . }}
Expand All @@ -27,8 +27,11 @@ spec:
http:
paths:
- path: {{ $ingressPath }}
pathType: ImplementationSpecific
Copy link
Copy Markdown

@flockoftanks flockoftanks Jun 17, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RE pathType ... These should probably be configurable, imo.

backend:
serviceName: {{ $fullName }}
servicePort: {{ $servicePort }}
service:
name: {{ $fullName }}
port:
number: {{ $servicePort }}
{{- end }}
{{- end }}
16 changes: 11 additions & 5 deletions elasticsearch/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
16 changes: 11 additions & 5 deletions kibana/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
9 changes: 6 additions & 3 deletions logstash/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
Expand All @@ -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 }}