Skip to content

Commit 8058b7e

Browse files
authored
feat(helm): Drop support for networking.k8s.io/v1beta1 (#12985)
1 parent 8f268d1 commit 8058b7e

1 file changed

Lines changed: 0 additions & 17 deletions

File tree

helm/defectdojo/templates/django-ingress.yaml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{{- if .Values.django.ingress.enabled -}}
22
{{- $fullName := include "defectdojo.fullname" . -}}
3-
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
43
apiVersion: networking.k8s.io/v1
5-
{{- else -}}
6-
apiVersion: networking.k8s.io/v1beta1
7-
{{- end }}
84
kind: Ingress
95
metadata:
106
name: {{ $fullName }}
@@ -30,11 +26,9 @@ metadata:
3026
{{- end }}
3127
{{- end }}
3228
spec:
33-
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
3429
{{- if .Values.django.ingress.ingressClassName }}
3530
ingressClassName: {{ .Values.django.ingress.ingressClassName }}
3631
{{- end }}
37-
{{- end }}
3832
{{- if .Values.django.ingress.activateTLS }}
3933
tls:
4034
- hosts:
@@ -47,7 +41,6 @@ spec:
4741
- host: {{ .Values.host }}
4842
http:
4943
paths:
50-
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
5144
- pathType: Prefix
5245
{{- if .Values.django.ingress.path }}
5346
path: {{ .Values.django.ingress.path }}
@@ -59,14 +52,4 @@ spec:
5952
name: {{ $fullName }}-django
6053
port:
6154
name: http
62-
{{- else }}
63-
{{- if .Values.django.ingress.path }}
64-
- path: {{ .Values.django.ingress.path }}
65-
{{- else }}
66-
- path: /
67-
{{- end }}
68-
backend:
69-
serviceName: {{ $fullName }}-django
70-
servicePort: http
71-
{{- end }}
7255
{{- end }}

0 commit comments

Comments
 (0)