Feat/support k8s 1.25 (#466)

* cronjobs from v1beta1 to v1 Signed-off-by: rebeca.jimenez <[email protected]> * HPA from v2beta1 to v2 Signed-off-by: rebeca.jimenez <[email protected]> * Decide HPA API version based on helm Capabilities Signed-off-by: rebeca.jimenez <[email protected]> * Decide CronJob API version based on helm capabilities Signed-off-by: rebeca.jimenez <[email protected]> * bump cockroach chart to v9.1.0 Signed-off-by: rebeca.jimenez <[email protected]> --------- Signed-off-by: rebeca.jimenez <[email protected]> Co-authored-by: rebeca.jimenez <[email protected]>
finleap-connect · Feb 8, 2024 · 289244a · 289244a
1 parent 9093253
commit 289244a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 7 deletions.
diff --git a/build/package/helm/commandhandler/templates/hpa.yaml b/build/package/helm/commandhandler/templates/hpa.yaml
@@ -1,5 +1,9 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "commandhandler.fullname" . }}

diff --git a/build/package/helm/eventstore/templates/cronjob-backup.yaml b/build/package/helm/eventstore/templates/cronjob-backup.yaml
@@ -1,6 +1,10 @@
 {{- $merged := merge (deepCopy .Values) (deepCopy (default (dict) .Values.global)) -}}
-{{- if .Values.backup.enabled }}
+{{- if .Values.backup.enabled -}}
+{{- if .Capabilities.APIVersions.Has "batch/v1/CronJob" }}
+apiVersion: batch/v1
+{{- else }}
 apiVersion: batch/v1beta1
+{{- end }}
 kind: CronJob
 metadata:
   name: {{ include "eventstore.fullname" . }}-backup

diff --git a/build/package/helm/eventstore/templates/hpa.yaml b/build/package/helm/eventstore/templates/hpa.yaml
@@ -1,5 +1,9 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "eventstore.fullname" . }}

diff --git a/build/package/helm/gateway/templates/hpa.yaml b/build/package/helm/gateway/templates/hpa.yaml
@@ -1,5 +1,9 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "gateway.fullname" . }}

diff --git a/build/package/helm/monoskope/Chart.yaml b/build/package/helm/monoskope/Chart.yaml
@@ -44,7 +44,7 @@ dependencies: # A list of the chart requirements
     repository: "file://../scimserver"
     condition: scimserver.enabled,global.scimserver.enabled
   - name: cockroachdb
-    version: 7.0.1
+    version: 9.1.0
     repository: https://charts.cockroachdb.com/
     condition: cockroachdb.enabled,global.cockroachdb.enabled
   - name: rabbitmq

diff --git a/build/package/helm/queryhandler/templates/hpa.yaml b/build/package/helm/queryhandler/templates/hpa.yaml
@@ -1,5 +1,9 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "queryhandler.fullname" . }}

diff --git a/build/package/helm/scimserver/templates/hpa.yaml b/build/package/helm/scimserver/templates/hpa.yaml
@@ -1,5 +1,9 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "scimserver.fullname" . }}