Merge pull request #487 from panpan0000/master

Deployment extensions/v1beta1 deprecated since 1.16, not 1.19
spotahome · Sep 22, 2022 · 2c37791 · 2c37791
2 parents 3353c09 + 4796546
commit 2c37791
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/charts/redisoperator/Chart.yaml b/charts/redisoperator/Chart.yaml
@@ -12,3 +12,4 @@ keywords:
   - "cluster"
 sources:
   - https://github.com/spotahome/redis-operator
+kubeVersion: '>=1.21.0-0'
diff --git a/charts/redisoperator/templates/_versions.tpl b/charts/redisoperator/templates/_versions.tpl
@@ -3,13 +3,7 @@
 Return the appropriate apiVersion for deployment.
 */}}
 {{- define "common.capabilities.deployment.apiVersion" -}}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 {{- print "apps/v1" -}}
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-{{- print "extensions/v1beta1" -}}
-{{- else -}}
-{{- print "apps/v1" -}}
-{{- end -}}
 {{- end -}}
 
 {{/*
@@ -23,4 +17,4 @@ Return the appropriate apiVersion for ingress.
 {{- else -}}
 {{- print "networking.k8s.io/v1beta1" -}}
 {{- end -}}
-{{- end -}}
+{{- end -}}