From 3aedcde5b19885caa84ee1e5f78d0c2399937b6f Mon Sep 17 00:00:00 2001 From: Tom Hayward Date: Fri, 5 May 2023 00:39:31 -0700 Subject: [PATCH] Correctly interpret .Capabilities.KubeVersion when it looks like a prerelease (#457) Signed-off-by: Tom Hayward --- CHANGELOG.md | 1 + templates/_helpers.tpl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a379b7eb..cabd5613 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## master / unreleased * [DEPENDENCY] Update quay.io/cortexproject/cortex Docker tag to v1.15.0 #453 +* [BUGFIX] Correctly interpret .Capabilities.KubeVersion when it looks like a prerelease #457 ## 2.1.0 / 2023-03-17 diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index bc2b90a2..f2457d5d 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -112,7 +112,7 @@ Create configuration for frontend memcached configuration Determine the policy api version */}} {{- define "cortex.pdbVersion" -}} -{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) -}} +{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21-0" .Capabilities.KubeVersion.Version) -}} policy/v1 {{- else -}} policy/v1beta1 @@ -153,7 +153,7 @@ Get volume of config secret of configMap Get cortex hpa version by k8s version */}} {{- define "cortex.hpaVersion" -}} -{{- if or (.Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler") (semverCompare ">=1.23" .Capabilities.KubeVersion.Version) -}} +{{- if or (.Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler") (semverCompare ">=1.23-0" .Capabilities.KubeVersion.Version) -}} autoscaling/v2 {{- else -}} autoscaling/v2beta2