فهرست منبع

[bitnami/kafka] add schedulerName for all resources (#5669)

* [bitnami/kafka] add schedulerName for all resources

* [bitnami/kafka] schedulerName add quote filter

Co-authored-by: Yevgeny Zegzhda <yevgeny.zegzhda@team.wrike.com>
Yevgeny 4 سال پیش
والد
کامیت
5ba7a1d33e

+ 1 - 1
bitnami/kafka/Chart.yaml

@@ -29,4 +29,4 @@ name: kafka
 sources:
   - https://github.com/bitnami/bitnami-docker-kafka
   - https://kafka.apache.org/
-version: 12.9.6
+version: 12.10.0

+ 9 - 6
bitnami/kafka/README.md

@@ -135,12 +135,13 @@ The following tables lists the configurable parameters of the Kafka chart and th
 
 ### Kafka provisioning parameters
 
-| Parameter                | Description                      | Default                  |
-|--------------------------|----------------------------------|--------------------------|
-| `provisioning.enabled`   | Enable kafka provisioning Job    | `false`                  |
-| `provisioning.image`     | Kafka provisioning Job image     | `Check values.yaml file` |
-| `provisioning.resources` | Kafka provisioning Job resources | `Check values.yaml file` |
-| `provisioning.topics`    | Kafka provisioning topics        | `[]`                     |
+| Parameter                    | Description                                                           | Default                  |
+|------------------------------|-----------------------------------------------------------------------|--------------------------|
+| `provisioning.enabled`       | Enable kafka provisioning Job                                         | `false`                  |
+| `provisioning.image`         | Kafka provisioning Job image                                          | `Check values.yaml file` |
+| `provisioning.resources`     | Kafka provisioning Job resources                                      | `Check values.yaml file` |
+| `provisioning.topics`        | Kafka provisioning topics                                             | `[]`                     |
+| `provisioning.schedulerName` | Name of the k8s scheduler (other than default) for kafka provisioning | `nil`                    |
 
 ### Statefulset parameters
 
@@ -165,6 +166,7 @@ The following tables lists the configurable parameters of the Kafka chart and th
 | `containerSecurityContext`  | Kafka containers' Security Context                                                        | `{}`                                               |
 | `resources.limits`          | The resources limits for Kafka containers                                                 | `{}`                                               |
 | `resources.requests`        | The requested resources for Kafka containers                                              | `{}`                                               |
+| `schedulerName`             | Name of the k8s scheduler (other than default)                                            | `nil`                                              |
 | `livenessProbe`             | Liveness probe configuration for Kafka                                                    | `Check values.yaml file`                           |
 | `readinessProbe`            | Readiness probe configuration for Kafka                                                   | `Check values.yaml file`                           |
 | `customLivenessProbe`       | Custom Liveness probe configuration for Kafka                                             | `{}`                                               |
@@ -263,6 +265,7 @@ The following tables lists the configurable parameters of the Kafka chart and th
 | `metrics.kafka.tlsCaSecret`     | Name of the existing secret containing the ca certificate file, if the ca cert can not be found in `metrics.kafka.certificatesSecret`                                        | `nil`                                                   |
 | `metrics.kafka.resources.limits`       | Kafka Exporter container resource limits                                                                                         | `{}`                                                    |
 | `metrics.kafka.resources.requests`     | Kafka Exporter container resource requests                                                                                       | `{}`                                                    |
+| `metrics.kafka.schedulerName`          | Name of the k8s scheduler (other than default) for Kafka Exporter                                                                | `nil`                                                   |
 | `metrics.kafka.service.type`           | Kubernetes service type (`ClusterIP`, `NodePort` or `LoadBalancer`) for Kafka Exporter                                           | `ClusterIP`                                             |
 | `metrics.kafka.service.port`           | Kafka Exporter Prometheus port                                                                                                   | `9308`                                                  |
 | `metrics.kafka.service.nodePort`       | Kubernetes HTTP node port                                                                                                        | `""`                                                    |

+ 4 - 1
bitnami/kafka/templates/kafka-metrics-deployment.yaml

@@ -26,7 +26,10 @@ spec:
       labels: {{- include "common.labels.standard" . | nindent 8 }}
         app.kubernetes.io/component: metrics
     spec:
-{{- include "kafka.imagePullSecrets" . | indent 6 }}
+      {{- include "kafka.imagePullSecrets" . | nindent 6 }}
+      {{- if .Values.metrics.kafka.schedulerName }}
+      schedulerName: {{ .Values.metrics.kafka.schedulerName | quote }}
+      {{- end }}
       containers:
         - name: kafka-exporter
           image: {{ include "kafka.metrics.kafka.image" . }}

+ 4 - 1
bitnami/kafka/templates/kafka-provisioning.yaml

@@ -24,7 +24,10 @@ spec:
         {{- end }}
       annotations:
     spec:
-{{- include "kafka.imagePullSecrets" . | indent 6 }}
+      {{- include "kafka.imagePullSecrets" . | nindent 6 }}
+      {{- if .Values.provisioning.schedulerName }}
+      schedulerName: {{ .Values.provisioning.schedulerName | quote }}
+      {{- end }}
       restartPolicy: OnFailure
       terminationGracePeriodSeconds: 0
       initContainers:

+ 3 - 0
bitnami/kafka/templates/statefulset.yaml

@@ -65,6 +65,9 @@ spec:
       {{- if .Values.hostAliases }}
       hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
       {{- end }}
+      {{- if .Values.schedulerName }}
+      schedulerName: {{ .Values.schedulerName | quote }}
+      {{- end }}
       {{- if .Values.affinity }}
       affinity: {{- include "common.tplvalues.render" (dict "value" .Values.affinity "context" $) | nindent 8 }}
       {{- else }}

+ 15 - 0
bitnami/kafka/values.yaml

@@ -45,6 +45,11 @@ image:
 ##
 hostAliases: []
 
+## Use an alternate scheduler, e.g. "stork".
+## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+##
+# schedulerName:
+
 ## StatefulSet controller supports relax its ordering guarantees while preserving its uniqueness and identity guarantees. There are two valid pod management policies: OrderedReady and Parallel
 ## ref: https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#pod-management-policy
 ##
@@ -811,6 +816,11 @@ provisioning:
     ##
     debug: false
 
+  ## Use an alternate scheduler, e.g. "stork".
+  ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+  ##
+  # schedulerName:
+
   resources:
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
@@ -860,6 +870,11 @@ metrics:
       ##
       pullSecrets: []
 
+    ## Use an alternate scheduler, e.g. "stork".
+    ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+    ##
+    # schedulerName:
+
     ## Extra flags to be passed to Kafka exporter
     ## Example:
     ## extraFlags: