Skip to content

updated ingress object api version to support k8s ingress v1.22 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anna-yn merged 1 commit into from
Jan 20, 2022
Merged

updated ingress object api version to support k8s ingress v1.22 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 19 additions & 2 deletions templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{{- if .Values.ingress.enabled }}
apiVersion: {{ .Values.ingress.apiVersion }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
labels:
Expand All @@ -16,9 +22,20 @@ spec:
rules:
- http:
paths:
- backend:
- path: {{ .path }}
{{- if and .Values.ingress.pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
pathType: {{ .Values.ingress.pathType }}
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ template "retool.fullname" . }}
port:
number: {{ .Values.service.externalPort }}
{{- else }}
serviceName: {{ template "retool.fullname" . }}
servicePort: {{ .Values.service.externalPort }}
{{- end }}
{{- if .Values.ingress.hostName }}
host: {{ .Values.ingress.hostName | quote }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ service:

ingress:
enabled: false
# For Kubernetes v1.14+, use 'networking.k8s.io/v1beta1'
apiVersion: "extensions/v1beta1"
labels: {}
annotations: {}
# kubernetes.io/ingress.class: nginx
Expand All @@ -92,6 +90,8 @@ ingress:
# hosts:
# - retool.example.com
# servicePort: service-port
pathType: ImplementationSpecific
className: nginx

postgresql:
# We highly recommend you do NOT use this subchart as is to run Postgres in a container
Expand Down