[bitnami/spring-cloud-dataflow] Use the new helper for HPA API version (#10213)

* Use the new helper for HPA API version

Signed-off-by: Miguel A. Cabrera Minagorri <devgorri@gmail.com>

* Contemplate targetAverageUtilization

Signed-off-by: Miguel A. Cabrera Minagorri <devgorri@gmail.com>

* Bump common and update HPA

Signed-off-by: Miguel A. Cabrera Minagorri <devgorri@gmail.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Miguel Ángel Cabrera Miñagorri
2022-05-24 11:26:43 +02:00
committed by GitHub
parent 9f7666fc4f
commit 8b813f692c
6 changed files with 48 additions and 12 deletions

View File

@@ -39,4 +39,4 @@ sources:
- https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow
- https://github.com/bitnami/bitnami-docker-spring-cloud-skipper
- https://dataflow.spring.io/
version: 9.1.2
version: 9.1.3

View File

@@ -78,14 +78,14 @@ helm uninstall my-release
| --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------- |
| `server.image.registry` | Spring Cloud Dataflow image registry | `docker.io` |
| `server.image.repository` | Spring Cloud Dataflow image repository | `bitnami/spring-cloud-dataflow` |
| `server.image.tag` | Spring Cloud Dataflow image tag (immutable tags are recommended) | `2.9.4-debian-10-r14` |
| `server.image.tag` | Spring Cloud Dataflow image tag (immutable tags are recommended) | `2.9.4-debian-10-r33` |
| `server.image.pullPolicy` | Spring Cloud Dataflow image pull policy | `IfNotPresent` |
| `server.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `server.image.debug` | Enable image debug mode | `false` |
| `server.hostAliases` | Deployment pod host aliases | `[]` |
| `server.composedTaskRunner.image.registry` | Spring Cloud Dataflow Composed Task Runner image registry | `docker.io` |
| `server.composedTaskRunner.image.repository` | Spring Cloud Dataflow Composed Task Runner image repository | `bitnami/spring-cloud-dataflow-composed-task-runner` |
| `server.composedTaskRunner.image.tag` | Spring Cloud Dataflow Composed Task Runner image tag (immutable tags are recommended) | `2.9.4-debian-10-r16` |
| `server.composedTaskRunner.image.tag` | Spring Cloud Dataflow Composed Task Runner image tag (immutable tags are recommended) | `2.9.4-debian-10-r44` |
| `server.configuration.streamingEnabled` | Enables or disables streaming data processing | `true` |
| `server.configuration.batchEnabled` | Enables or disables batch data (tasks and schedules) processing | `true` |
| `server.configuration.accountName` | The name of the account to configure for the Kubernetes platform | `default` |
@@ -195,7 +195,7 @@ helm uninstall my-release
| `skipper.hostAliases` | Deployment pod host aliases | `[]` |
| `skipper.image.registry` | Spring Cloud Skipper image registry | `docker.io` |
| `skipper.image.repository` | Spring Cloud Skipper image repository | `bitnami/spring-cloud-skipper` |
| `skipper.image.tag` | Spring Cloud Skipper image tag (immutable tags are recommended) | `2.8.4-debian-10-r16` |
| `skipper.image.tag` | Spring Cloud Skipper image tag (immutable tags are recommended) | `2.8.4-debian-10-r44` |
| `skipper.image.pullPolicy` | Spring Cloud Skipper image pull policy | `IfNotPresent` |
| `skipper.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `skipper.image.debug` | Enable image debug mode | `false` |
@@ -318,7 +318,7 @@ helm uninstall my-release
| `metrics.enabled` | Enable Prometheus metrics | `false` |
| `metrics.image.registry` | Prometheus Rsocket Proxy image registry | `docker.io` |
| `metrics.image.repository` | Prometheus Rsocket Proxy image repository | `bitnami/prometheus-rsocket-proxy` |
| `metrics.image.tag` | Prometheus Rsocket Proxy image tag (immutable tags are recommended) | `1.4.0-debian-10-r55` |
| `metrics.image.tag` | Prometheus Rsocket Proxy image tag (immutable tags are recommended) | `1.4.0-debian-10-r83` |
| `metrics.image.pullPolicy` | Prometheus Rsocket Proxy image pull policy | `IfNotPresent` |
| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `metrics.resources.limits` | The resources limits for the Prometheus Rsocket Proxy container | `{}` |
@@ -395,7 +395,7 @@ helm uninstall my-release
| `waitForBackends.enabled` | Wait for the database and other services (such as Kafka or RabbitMQ) used when enabling streaming | `true` |
| `waitForBackends.image.registry` | Init container wait-for-backend image registry | `docker.io` |
| `waitForBackends.image.repository` | Init container wait-for-backend image name | `bitnami/kubectl` |
| `waitForBackends.image.tag` | Init container wait-for-backend image tag | `1.23.6-debian-10-r0` |
| `waitForBackends.image.tag` | Init container wait-for-backend image tag | `1.24.0-debian-10-r2` |
| `waitForBackends.image.pullPolicy` | Init container wait-for-backend image pull policy | `IfNotPresent` |
| `waitForBackends.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `waitForBackends.resources.limits` | Init container wait-for-backend resource limits | `{}` |

View File

@@ -1,5 +1,5 @@
{{- if .Values.metrics.autoscaling.enabled }}
apiVersion: autoscaling/v2beta1
apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
kind: HorizontalPodAutoscaler
metadata:
name: {{ include "scdf.fullname" . }}-prometheus-proxy
@@ -24,12 +24,24 @@ spec:
- type: Resource
resource:
name: cpu
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.metrics.autoscaling.targetCPU }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.metrics.autoscaling.targetCPU }}
{{- end }}
{{- end }}
{{- if .Values.metrics.autoscaling.targetMemory }}
- type: Resource
resource:
name: memory
targetAverageUtilization: {{ .Values.metrics.autoscaling.targetMemory }}
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.metrics.autoscaling.targetMemory }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.metrics.autoscaling.targetMemory }}
{{- end }}
{{- end }}
{{- end }}

View File

@@ -1,5 +1,5 @@
{{- if .Values.server.autoscaling.enabled }}
apiVersion: autoscaling/v2beta1
apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
kind: HorizontalPodAutoscaler
metadata:
name: {{ include "scdf.fullname" . }}-server
@@ -24,12 +24,24 @@ spec:
- type: Resource
resource:
name: cpu
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.server.autoscaling.targetCPU }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.server.autoscaling.targetCPU }}
{{- end }}
{{- end }}
{{- if .Values.server.autoscaling.targetMemory }}
- type: Resource
resource:
name: memory
targetAverageUtilization: {{ .Values.server.autoscaling.targetMemory }}
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.server.autoscaling.targetMemory }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.server.autoscaling.targetMemory }}
{{- end }}
{{- end }}
{{- end }}

View File

@@ -1,5 +1,5 @@
{{- if and (or .Values.skipper.enabled .Values.server.configuration.streamingEnabled) .Values.skipper.autoscaling.enabled }}
apiVersion: autoscaling/v2beta1
apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
kind: HorizontalPodAutoscaler
metadata:
name: {{ include "scdf.fullname" . }}-skipper
@@ -24,12 +24,24 @@ spec:
- type: Resource
resource:
name: cpu
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.skipper.autoscaling.targetCPU }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.skipper.autoscaling.targetCPU }}
{{- end }}
{{- end }}
{{- if .Values.skipper.autoscaling.targetMemory }}
- type: Resource
resource:
name: memory
targetAverageUtilization: {{ .Values.skipper.autoscaling.targetMemory }}
{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
targetAverageUtilization: {{ .Values.skipper.autoscaling.targetMemory }}
{{- else }}
target:
type: Utilization
averageUtilization: {{ .Values.skipper.autoscaling.targetMemory }}
{{- end }}
{{- end }}
{{- end }}

0
bitnami/spring-cloud-dataflow/values.yaml Executable file → Normal file
View File