workaround for .Capabilities.APIVersions

Signed-off-by: Tom Hayward <[email protected]>
cortexproject · Dec 1, 2021 · 1feac99 · 1feac99
1 parent 11c6f43
commit 1feac99
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/templates/alertmanager/alertmanager-poddisruptionbudget.yaml b/templates/alertmanager/alertmanager-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (gt (int .Values.alertmanager.replicas) 1) (.Values.alertmanager.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1

diff --git a/templates/compactor/compactor-poddisruptionbudget.yaml b/templates/compactor/compactor-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (gt (int .Values.compactor.replicas) 1) (.Values.compactor.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1

diff --git a/templates/configs/configs-poddisruptionbudget.yaml b/templates/configs/configs-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (gt (int .Values.configs.replicas) 1) (.Values.configs.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1

diff --git a/templates/distributor/distributor-poddisruptionbudget.yaml b/templates/distributor/distributor-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (gt (int .Values.distributor.replicas) 1) (.Values.distributor.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1

diff --git a/templates/ingester/ingester-poddisruptionbudget.yaml b/templates/ingester/ingester-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (gt (int .Values.ingester.replicas) 1) (.Values.ingester.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1

diff --git a/templates/nginx/nginx-poddisruptionbudget.yaml b/templates/nginx/nginx-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (.Values.nginx.enabled) (gt (int .Values.nginx.replicas) 1) (.Values.nginx.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1

diff --git a/templates/querier/querier-poddisruptionbudget.yaml b/templates/querier/querier-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (gt (int .Values.querier.replicas) 1) (.Values.querier.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1

diff --git a/templates/query-frontend/query-poddisruptionbudget.yaml b/templates/query-frontend/query-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (gt (int .Values.query_frontend.replicas) 1) (.Values.query_frontend.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1

diff --git a/templates/ruler/ruler-poddisruptionbudget.yaml b/templates/ruler/ruler-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (gt (int .Values.ruler.replicas) 1) (.Values.ruler.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1

diff --git a/templates/store-gateway/store-gateway-poddisruptionbudget.yaml b/templates/store-gateway/store-gateway-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (gt (int .Values.store_gateway.replicas) 1) (.Values.store_gateway.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1

diff --git a/templates/table-manager/table-manager-poddisruptionbudget.yaml b/templates/table-manager/table-manager-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and (gt (int .Values.table_manager.replicas) 1) (.Values.table_manager.podDisruptionBudget) }}
-{{- if .Capabilities.APIVersions.Has "policy/v1"}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1