From f678ca26294543b0d53e0cb85658a4fda36c12bd Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Tue, 7 Dec 2021 10:03:13 +0100 Subject: [PATCH] fix: work around API versions issue when deploying with ArgoCD See https://github.com/argoproj/argo-cd/issues/7291 --- CHANGELOG.md | 5 +++-- deploy/helm/sumologic/templates/_api_versions_helpers.tpl | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c16d3ef58b..6d1e6e9a82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - feat(helm): add fluentd init containers [#1928][#1928] - Add support for GKE 1.21 [#1907][#1907] - feat: add affinity to fluentd events statefulset [#1895][#1895] -- feat(helm): add PodDisruptionBudget api version helm chart helpers [#1865][#1865] -- feat: add option to disable `service` enrichment [#1936](#1936) +- feat(helm): add PodDisruptionBudget api version helm chart helpers [#1865][#1865] [#1943][#1943] +- feat: add option to disable `service` enrichment [#1936][#1936] ### Changed @@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#1927]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/1927 [#1928]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/1928 [#1936]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/1936 +[#1943]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/1943 ## [v2.2.0][v2_2_0] - 2021-11-17 diff --git a/deploy/helm/sumologic/templates/_api_versions_helpers.tpl b/deploy/helm/sumologic/templates/_api_versions_helpers.tpl index dbe0fb226f..8b55ef7c0d 100644 --- a/deploy/helm/sumologic/templates/_api_versions_helpers.tpl +++ b/deploy/helm/sumologic/templates/_api_versions_helpers.tpl @@ -8,9 +8,7 @@ apiVersion: {{ include "apiVersion.podDisruptionBudget" . }} {{- define "apiVersion.podDisruptionBudget" -}} {{- if .Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" -}} policy/v1 -{{- else if .Capabilities.APIVersions.Has "policy/v1beta1/PodDisruptionBudget" -}} -policy/v1beta1 {{- else -}} -{{- fail "\nPodDisruptionBudget not available on the cluster in neither policy/v1/v1beta1 nor in policy/v1/v1beta1 apiVersion" -}} +policy/v1beta1 {{- end -}} {{- end -}}