Skip to content

Commit 200de22

Browse files
authored
Merge pull request #58 from LCOGT/fix/ingress-v1.22
Fix/ingress v1.22
2 parents f88f492 + f9b858c commit 200de22

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

helm-chart/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: v1
22
appVersion: "stable"
33
description: Helm Chart for the HERMES frontend
44
name: hermes-frontend
5-
version: 0.1.0
5+
version: 0.2.0

helm-chart/templates/ingress.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
{{- if .Values.ingress.enabled -}}
22
{{- $fullName := include "hermes-frontend.fullname" . -}}
33
{{- $svcPort := .Values.service.port -}}
4-
{{- if semverCompare ">=1.22-0" .Capabilities.KubeVersion.GitVersion -}}
54
apiVersion: networking.k8s.io/v1
6-
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
7-
apiVersion: networking.k8s.io/v1beta1
8-
{{- else -}}
9-
apiVersion: extensions/v1beta1
10-
{{- end }}
115
kind: Ingress
126
metadata:
137
name: {{ $fullName }}
@@ -37,15 +31,10 @@ spec:
3731
- path: {{ . }}
3832
pathType: Prefix
3933
backend:
40-
{{- if semverCompare ">=1.22-0" $.Capabilities.KubeVersion.GitVersion }}
4134
service:
4235
name: {{ $fullName }}
4336
port:
4437
number: {{ $svcPort }}
45-
{{- else}}
46-
serviceName: {{ $fullName }}
47-
servicePort: {{ $svcPort }}
48-
{{- end }}
4938
{{- end }}
5039
{{- end }}
5140
{{- end }}

0 commit comments

Comments
 (0)