Skip to content

Commit 289244a

Browse files
RyuS3kirebeca.jimenez
andauthored
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]>
1 parent 9093253 commit 289244a

File tree

7 files changed

+31
-7
lines changed

7 files changed

+31
-7
lines changed

build/package/helm/commandhandler/templates/hpa.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
{{- if .Values.autoscaling.enabled }}
1+
{{- if .Values.autoscaling.enabled -}}
2+
{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
3+
apiVersion: autoscaling/v2
4+
{{- else }}
25
apiVersion: autoscaling/v2beta1
6+
{{- end }}
37
kind: HorizontalPodAutoscaler
48
metadata:
59
name: {{ include "commandhandler.fullname" . }}

build/package/helm/eventstore/templates/cronjob-backup.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{{- $merged := merge (deepCopy .Values) (deepCopy (default (dict) .Values.global)) -}}
2-
{{- if .Values.backup.enabled }}
2+
{{- if .Values.backup.enabled -}}
3+
{{- if .Capabilities.APIVersions.Has "batch/v1/CronJob" }}
4+
apiVersion: batch/v1
5+
{{- else }}
36
apiVersion: batch/v1beta1
7+
{{- end }}
48
kind: CronJob
59
metadata:
610
name: {{ include "eventstore.fullname" . }}-backup

build/package/helm/eventstore/templates/hpa.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
{{- if .Values.autoscaling.enabled }}
1+
{{- if .Values.autoscaling.enabled -}}
2+
{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
3+
apiVersion: autoscaling/v2
4+
{{- else }}
25
apiVersion: autoscaling/v2beta1
6+
{{- end }}
37
kind: HorizontalPodAutoscaler
48
metadata:
59
name: {{ include "eventstore.fullname" . }}

build/package/helm/gateway/templates/hpa.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
{{- if .Values.autoscaling.enabled }}
1+
{{- if .Values.autoscaling.enabled -}}
2+
{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
3+
apiVersion: autoscaling/v2
4+
{{- else }}
25
apiVersion: autoscaling/v2beta1
6+
{{- end }}
37
kind: HorizontalPodAutoscaler
48
metadata:
59
name: {{ include "gateway.fullname" . }}

build/package/helm/monoskope/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies: # A list of the chart requirements
4444
repository: "file://../scimserver"
4545
condition: scimserver.enabled,global.scimserver.enabled
4646
- name: cockroachdb
47-
version: 7.0.1
47+
version: 9.1.0
4848
repository: https://charts.cockroachdb.com/
4949
condition: cockroachdb.enabled,global.cockroachdb.enabled
5050
- name: rabbitmq

build/package/helm/queryhandler/templates/hpa.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
{{- if .Values.autoscaling.enabled }}
1+
{{- if .Values.autoscaling.enabled -}}
2+
{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
3+
apiVersion: autoscaling/v2
4+
{{- else }}
25
apiVersion: autoscaling/v2beta1
6+
{{- end }}
37
kind: HorizontalPodAutoscaler
48
metadata:
59
name: {{ include "queryhandler.fullname" . }}

build/package/helm/scimserver/templates/hpa.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
{{- if .Values.autoscaling.enabled }}
1+
{{- if .Values.autoscaling.enabled -}}
2+
{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
3+
apiVersion: autoscaling/v2
4+
{{- else }}
25
apiVersion: autoscaling/v2beta1
6+
{{- end }}
37
kind: HorizontalPodAutoscaler
48
metadata:
59
name: {{ include "scimserver.fullname" . }}

0 commit comments

Comments
 (0)