From a2d35a178d0778811fa9a5ad627323bae7b95d16 Mon Sep 17 00:00:00 2001 From: Narsing Metpally Date: Fri, 10 Dec 2021 10:35:01 -0700 Subject: [PATCH 1/3] adding Kind to ApiVersion --- charts/consul/templates/server-disruptionbudget.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/consul/templates/server-disruptionbudget.yaml b/charts/consul/templates/server-disruptionbudget.yaml index 866698aac8..edf9c1c57f 100644 --- a/charts/consul/templates/server-disruptionbudget.yaml +++ b/charts/consul/templates/server-disruptionbudget.yaml @@ -1,7 +1,7 @@ {{- if (and .Values.server.disruptionBudget.enabled (or (and (ne (.Values.server.enabled | toString) "-") .Values.server.enabled) (and (eq (.Values.server.enabled | toString) "-") .Values.global.enabled))) }} # PodDisruptionBudget to prevent degrading the server cluster through # voluntary cluster changes. -{{- if .Capabilities.APIVersions.Has "policy/v1" }} +{{- if .Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" }} apiVersion: policy/v1 {{- else }} apiVersion: policy/v1beta1 From 5263d27325cff7026f1046f266da18bcb036b22d Mon Sep 17 00:00:00 2001 From: Narsing Metpally Date: Wed, 5 Jan 2022 17:13:17 -0700 Subject: [PATCH 2/3] updating api version for unit testcase --- charts/consul/test/unit/server-disruptionbudget.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/consul/test/unit/server-disruptionbudget.bats b/charts/consul/test/unit/server-disruptionbudget.bats index db6ae1bca1..eb076ac775 100755 --- a/charts/consul/test/unit/server-disruptionbudget.bats +++ b/charts/consul/test/unit/server-disruptionbudget.bats @@ -127,7 +127,7 @@ load _helpers cd `chart_dir` local actual=$(helm template \ -s templates/server-disruptionbudget.yaml \ - --api-versions 'policy/v1' \ + --api-versions 'policy/v1/PodDisruptionBudget' \ . | tee /dev/stderr | yq -r '.apiVersion' | tee /dev/stderr) [ "${actual}" = "policy/v1" ] From 8a5284d9f32f11c95ca02e5f1efdfb40702afcc9 Mon Sep 17 00:00:00 2001 From: Narsing Metpally Date: Wed, 5 Jan 2022 17:13:17 -0700 Subject: [PATCH 3/3] updating api version for unit testcase --- charts/consul/test/unit/server-disruptionbudget.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/consul/test/unit/server-disruptionbudget.bats b/charts/consul/test/unit/server-disruptionbudget.bats index db6ae1bca1..eb076ac775 100755 --- a/charts/consul/test/unit/server-disruptionbudget.bats +++ b/charts/consul/test/unit/server-disruptionbudget.bats @@ -127,7 +127,7 @@ load _helpers cd `chart_dir` local actual=$(helm template \ -s templates/server-disruptionbudget.yaml \ - --api-versions 'policy/v1' \ + --api-versions 'policy/v1/PodDisruptionBudget' \ . | tee /dev/stderr | yq -r '.apiVersion' | tee /dev/stderr) [ "${actual}" = "policy/v1" ]