downgrade ingress to networking.k8s.io/v1beta1

neuro-inc · Dec 9, 2021 · 0038436 · 0038436
1 parent 8e49cda
commit 0038436
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/charts/platform-storage/templates/_helpers.tpl b/charts/platform-storage/templates/_helpers.tpl
@@ -25,13 +25,3 @@ chart: {{ include "platformStorage.chart" . }}
 heritage: {{ .Release.Service | quote }}
 release: {{ .Release.Name | quote }}
 {{- end -}}
-
-{{- define "platformStorage.ingress.apiVersion" -}}
-{{- if and (.Capabilities.APIVersions.Has "networking.k8s.io/v1") (semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version) -}}
-{{- print "networking.k8s.io/v1" -}}
-{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
-{{- print "networking.k8s.io/v1beta1" -}}
-{{- else -}}
-{{- print "extensions/v1beta1" -}}
-{{- end -}}
-{{- end -}}
diff --git a/charts/platform-storage/templates/ingress.yaml b/charts/platform-storage/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled }}
-apiVersion: {{ include "platformStorage.ingress.apiVersion" . }}
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: {{ include "platformStorage.fullname" . }}