Skip to content

Commit 1df2081

Browse files
fix(intel-chart): ensure Ingress v1 + pathType for modern Kubernetes (#197)
Fixes: #196
1 parent 6df6ba1 commit 1df2081

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

charts/intel/templates/ingress.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
{{- $fullName := include "codetogether.fullname" . -}}
33
{{- $svcPort := .Values.service.port -}}
44
{{- $host := (urlParse .Values.codetogether.url).host }}
5-
{{- if semverCompare ">=1.19" .Capabilities.KubeVersion.GitVersion -}}
5+
{{- /* Prefer API discovery; fall back to version check. */ -}}
6+
{{- $kver := .Capabilities.KubeVersion.Version | default .Capabilities.KubeVersion.GitVersion -}}
7+
{{- $hasIngressV1 := .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
8+
{{- $isIngressV1 := or $hasIngressV1 (semverCompare ">=1.19-0" $kver) -}}
9+
{{- if $isIngressV1 -}}
610
apiVersion: networking.k8s.io/v1
711
{{- else -}}
812
apiVersion: networking.k8s.io/v1beta1
@@ -17,7 +21,7 @@ metadata:
1721
{{- toYaml . | nindent 4 }}
1822
{{- end }}
1923
spec:
20-
{{- if and .Values.ingress.className (semverCompare ">=1.18" .Capabilities.KubeVersion.GitVersion) }}
24+
{{- if and .Values.ingress.className $isIngressV1 }}
2125
ingressClassName: {{ .Values.ingress.className }}
2226
{{- end}}
2327
{{- if .Values.ingress.tls }}
@@ -31,11 +35,11 @@ spec:
3135
http:
3236
paths:
3337
- path: /
34-
{{- if (semverCompare ">=1.18" $.Capabilities.KubeVersion.GitVersion) }}
38+
{{- if $isIngressV1 }}
3539
pathType: "Prefix"
3640
{{- end }}
3741
backend:
38-
{{- if semverCompare ">=1.19" $.Capabilities.KubeVersion.GitVersion }}
42+
{{- if $isIngressV1 }}
3943
service:
4044
name: {{ $fullName }}
4145
port:
@@ -44,4 +48,4 @@ spec:
4448
serviceName: {{ $fullName }}
4549
servicePort: {{ $svcPort }}
4650
{{- end }}
47-
{{- end }}
51+
{{- end }}

0 commit comments

Comments
 (0)