Fixed breaking changes in HPAs in v2 & RabbitMQ configuration (#467)

* Fixed breaking changes in HPAs in v2 * Fixed: RabbitMQ's configurations are now strict JSON as required by 3.12 and higher. * Bumped bitnami/rabbitmq to latest version (RabbitMQ 3.12.12)
finleap-connect · Feb 9, 2024 · 195512b · 195512b
1 parent 289244a
commit 195512b
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 13 deletions.
diff --git a/build/package/helm/commandhandler/templates/hpa.yaml b/build/package/helm/commandhandler/templates/hpa.yaml
@@ -24,12 +24,24 @@ spec:
     - type: Resource
       resource:
         name: cpu
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+          type: Utilization
+{{- else }}
         targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+          type: Utilization
+{{- else }}
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
     {{- end }}
 {{- end }}
diff --git a/build/package/helm/eventstore/templates/hpa.yaml b/build/package/helm/eventstore/templates/hpa.yaml
@@ -21,12 +21,24 @@ spec:
     - type: Resource
       resource:
         name: cpu
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+          type: Utilization
+{{- else }}
         targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+          type: Utilization
+{{- else }}
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
     {{- end }}
 {{- end }}
diff --git a/build/package/helm/gateway/templates/hpa.yaml b/build/package/helm/gateway/templates/hpa.yaml
@@ -21,12 +21,24 @@ spec:
     - type: Resource
       resource:
         name: cpu
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+          type: Utilization
+{{- else }}
         targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+          type: Utilization
+{{- else }}
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
     {{- end }}
 {{- end }}
diff --git a/build/package/helm/monoskope/Chart.lock b/build/package/helm/monoskope/Chart.lock
@@ -16,12 +16,12 @@ dependencies:
   version: 0.0.1-local
 - name: cockroachdb
   repository: https://charts.cockroachdb.com/
-  version: 7.0.1
+  version: 9.1.0
 - name: rabbitmq
   repository: https://charts.bitnami.com/bitnami
-  version: 8.32.2
+  version: 12.1.2
 - name: emissary-ingress
   repository: https://getambassador.io
   version: 8.0.0
-digest: sha256:76299ec2f3da8693fe07db6183dc3183ef8a56e30007a5388d04e25d6bca8f0c
-generated: "2022-07-27T09:56:50.706907+02:00"
+digest: sha256:ec30339db7783e8a6e317fb35bc68ed0279e37643affff1137a6c7662ba14160
+generated: "2024-02-09T11:51:35.571032+01:00"
diff --git a/build/package/helm/monoskope/Chart.yaml b/build/package/helm/monoskope/Chart.yaml
@@ -48,7 +48,7 @@ dependencies: # A list of the chart requirements
     repository: https://charts.cockroachdb.com/
     condition: cockroachdb.enabled,global.cockroachdb.enabled
   - name: rabbitmq
-    version: 12.1.2
+    version: 12.10.0
     repository: https://charts.bitnami.com/bitnami
     condition: rabbitmq.enabled,global.rabbitmq.enabled
   - name: emissary-ingress

diff --git a/build/package/helm/monoskope/templates/rabbitmq/secret-loaddefinition.yaml b/build/package/helm/monoskope/templates/rabbitmq/secret-loaddefinition.yaml
@@ -38,7 +38,7 @@ stringData:
                 "pattern": "",
                 "definition": {
                     "ha-mode": "exactly",
-                    "ha-params": {{ add1 (div .Values.rabbitmq.replicaCount 2) }},
+                    "ha-params": {{ add1 (div .Values.rabbitmq.replicaCount 2) }}
                 }
             }
         ],
@@ -47,4 +47,4 @@ stringData:
         "bindings": []
     }
 {{- end }}
-{{- end }}
+{{- end }}
diff --git a/build/package/helm/monoskope/templates/rabbitmq/vaultsecret-rabbitmq.yaml b/build/package/helm/monoskope/templates/rabbitmq/vaultsecret-rabbitmq.yaml
@@ -73,7 +73,7 @@ spec:
                   "pattern": "",
                   "definition": {
                       "ha-mode": "exactly",
-                      "ha-params": {{ add1 (div .Values.rabbitmq.replicaCount 2) }},
+                      "ha-params": {{ add1 (div .Values.rabbitmq.replicaCount 2) }}
                   }
               }
           ],

diff --git a/build/package/helm/queryhandler/templates/hpa.yaml b/build/package/helm/queryhandler/templates/hpa.yaml
@@ -24,12 +24,24 @@ spec:
     - type: Resource
       resource:
         name: cpu
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+          type: Utilization
+{{- else }}
         targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+ {{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+          type: Utilization
+{{- else }}
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
     {{- end }}
 {{- end }}
diff --git a/build/package/helm/scimserver/templates/hpa.yaml b/build/package/helm/scimserver/templates/hpa.yaml
@@ -24,12 +24,24 @@ spec:
     - type: Resource
       resource:
         name: cpu
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+          type: Utilization
+{{- else }}
         targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+        target:
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+          type: Utilization
+{{- else }}
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+{{- end }}
     {{- end }}
 {{- end }}