feat(vector): Switch policy version based on capabilities and k8s ver…

…sion (#197) * feat(vector): Switch policy version based on capabilities and k8s version Signed-off-by: Spencer Gilbert <[email protected]> * version bump Signed-off-by: Spencer Gilbert <[email protected]>
vectordotdev · Apr 14, 2022 · 347403e · 347403e
1 parent f3825de
commit 347403e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/charts/vector/Chart.yaml b/charts/vector/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: vector
-version: "0.9.0"
+version: "0.10.0"
 kubeVersion: ">=1.15.0-0"
 description: A lightweight, ultra-fast tool for building observability pipelines
 type: application

diff --git a/charts/vector/README.md b/charts/vector/README.md
@@ -1,6 +1,6 @@
 # Vector
 
-![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.20.1-distroless-libc](https://img.shields.io/badge/AppVersion-0.20.1--distroless--libc-informational?style=flat-square)
+![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.20.1-distroless-libc](https://img.shields.io/badge/AppVersion-0.20.1--distroless--libc-informational?style=flat-square)
 
 [Vector](https://vector.dev/) is a high-performance, end-to-end observability data pipeline that puts you in control of your observability data. Collect, transform, and route all your logs, metrics, and traces to any vendors you want today and any other vendors you may want tomorrow. Vector enables dramatic cost reduction, novel data enrichment, and data security where you need it, not where is most convenient for your vendors.
 

diff --git a/charts/vector/templates/_helpers.tpl b/charts/vector/templates/_helpers.tpl
@@ -67,6 +67,17 @@ Create the name of the service account to use.
 {{- end }}
 {{- end }}
 
+{{/*
+Return the appropriate apiVersion for PodDisruptionBudget policy APIs.
+*/}}
+{{- define "policy.poddisruptionbudget.apiVersion" -}}
+{{- if or (.Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget") (semverCompare ">=1.21" .Capabilities.KubeVersion.Version) -}}
+"policy/v1"
+{{- else -}}
+"policy/v1beta1"
+{{- end -}}
+{{- end -}}
+
 {{/*
 Generate an array of ServicePorts based on `.Values.customConfig`.
 */}}

diff --git a/charts/vector/templates/_pod.tpl b/charts/vector/templates/_pod.tpl
@@ -2,7 +2,7 @@
 Defines the PodSpec for Vector.
 */}}
 {{- define "vector.pod" -}}
-serviceAccountName: {{ include "vector.serviceAccountName" . }} 
+serviceAccountName: {{ include "vector.serviceAccountName" . }}
 {{- with .Values.podSecurityContext }}
 securityContext:
 {{ toYaml . | indent 2 }}

diff --git a/charts/vector/templates/pdb.yaml b/charts/vector/templates/pdb.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.podDisruptionBudget.enabled }}
-apiVersion: policy/v1beta1
+apiVersion: {{ template "policy.poddisruptionbudget.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "vector.fullname" . }}