fix: rely on api rather than on k8s version (#3366) (#3367)

* fix: rely on api rather than on k8s version (#3366) * use autoscaling/v2 if available on the cluster * add changelog entry * Rename 3315.fixed.txt to 3366.fixed.txt --------- Co-authored-by: Christopher Montoro <[email protected]> (cherry picked from commit a6fb970) * Rename 3366.fixed.txt to 3367.fixed.txt
SumoLogic · Oct 31, 2023 · 0228337 · 0228337
1 parent b953af9
commit 0228337
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/.changelog/3367.fixed.txt b/.changelog/3367.fixed.txt
@@ -0,0 +1 @@
+use autoscaling/v2 if available on the cluster
diff --git a/deploy/helm/sumologic/templates/_helpers/_api_versions.tpl b/deploy/helm/sumologic/templates/_helpers/_api_versions.tpl
@@ -12,3 +12,18 @@ policy/v1
 policy/v1beta1
 {{- end -}}
 {{- end -}}
+
+{{/*
+Use HorizontalPodAutoscaler apiVersion that is available on the cluster
+
+Example Usage:
+apiVersion: {{ include "apiVersion.horizontalPodAutoscaler" . }}
+
+*/}}
+{{- define "apiVersion.horizontalPodAutoscaler" -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2" -}}
+autoscaling/v2
+{{- else -}}
+autoscaling/v2beta2
+{{- end -}}
+{{- end -}}
diff --git a/deploy/helm/sumologic/templates/instrumentation/otelcol-instrumentation/hpa.yaml b/deploy/helm/sumologic/templates/instrumentation/otelcol-instrumentation/hpa.yaml
@@ -1,11 +1,7 @@
 {{ $otelcolInstrumentation := .Values.otelcolInstrumentation }}
 {{ $tracesEnabled := .Values.sumologic.traces.enabled }}
 {{- if and $tracesEnabled $otelcolInstrumentation.enabled $otelcolInstrumentation.autoscaling.enabled }}
-{{- if and (eq .Capabilities.KubeVersion.Major "1") (lt (int (include "kubernetes.minor" .)) 23) }}
-apiVersion: autoscaling/v2beta2
-{{- else }}
-apiVersion: autoscaling/v2
-{{- end }}
+apiVersion: {{ include "apiVersion.horizontalPodAutoscaler" . }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "sumologic.metadata.name.otelcolinstrumentation.hpa" . }}

diff --git a/deploy/helm/sumologic/templates/instrumentation/traces-gateway/hpa.yaml b/deploy/helm/sumologic/templates/instrumentation/traces-gateway/hpa.yaml
@@ -1,11 +1,7 @@
 {{ $tracesGateway := .Values.tracesGateway }}
 {{ $tracesEnabled := .Values.sumologic.traces.enabled }}
 {{- if and $tracesEnabled $tracesGateway.enabled $tracesGateway.autoscaling.enabled }}
-{{- if and (eq .Capabilities.KubeVersion.Major "1") (lt (int (include "kubernetes.minor" .)) 23) }}
-apiVersion: autoscaling/v2beta2
-{{- else }}
-apiVersion: autoscaling/v2
-{{- end }}
+apiVersion: {{ include "apiVersion.horizontalPodAutoscaler" . }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "sumologic.metadata.name.tracesgateway.hpa" . }}

diff --git a/deploy/helm/sumologic/templates/logs/common/hpa.yaml b/deploy/helm/sumologic/templates/logs/common/hpa.yaml
@@ -1,9 +1,5 @@
 {{- if and (eq (include "logs.otelcol.enabled" .) "true") (.Values.metadata.logs.autoscaling.enabled) }}
-{{- if and (eq .Capabilities.KubeVersion.Major "1") (lt (int (include "kubernetes.minor" .)) 23) }}
-apiVersion: autoscaling/v2beta2
-{{- else }}
-apiVersion: autoscaling/v2
-{{- end }}
+apiVersion: {{ include "apiVersion.horizontalPodAutoscaler" . }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "sumologic.metadata.name.logs.hpa" . }}

diff --git a/deploy/helm/sumologic/templates/metrics/common/hpa.yaml b/deploy/helm/sumologic/templates/metrics/common/hpa.yaml
@@ -1,9 +1,5 @@
 {{- if and (eq (include "metrics.otelcol.enabled" .) "true") ( .Values.metadata.metrics.autoscaling.enabled) }}
-{{- if and (eq .Capabilities.KubeVersion.Major "1") (lt (int (include "kubernetes.minor" .)) 23) }}
-apiVersion: autoscaling/v2beta2
-{{- else }}
-apiVersion: autoscaling/v2
-{{- end }}
+apiVersion: {{ include "apiVersion.horizontalPodAutoscaler" . }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "sumologic.metadata.name.metrics.hpa" . }}