From fcbcaf6346c20e2f035c64ee940602eb2e3c9a40 Mon Sep 17 00:00:00 2001 From: Ryan Dawson Date: Fri, 16 Nov 2018 17:37:17 +0000 Subject: [PATCH] allow override of busybox like in stable/efs-provisioner (#8736) Signed-off-by: ryandawsonuk --- stable/rabbitmq-ha/Chart.yaml | 2 +- stable/rabbitmq-ha/README.md | 4 +++- stable/rabbitmq-ha/templates/statefulset.yaml | 3 ++- stable/rabbitmq-ha/values.yaml | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml index 153f7421f2..44bde5a17f 100644 --- a/stable/rabbitmq-ha/Chart.yaml +++ b/stable/rabbitmq-ha/Chart.yaml @@ -1,7 +1,7 @@ name: rabbitmq-ha apiVersion: v1 appVersion: 3.7.4 -version: 1.13.0 +version: 1.13.1 description: Highly available RabbitMQ cluster, the open source message broker software that implements the Advanced Message Queuing Protocol (AMQP). keywords: diff --git a/stable/rabbitmq-ha/README.md b/stable/rabbitmq-ha/README.md index dc2932420b..fc5fe54eb8 100644 --- a/stable/rabbitmq-ha/README.md +++ b/stable/rabbitmq-ha/README.md @@ -146,7 +146,9 @@ and their default values. | `updateStrategy` | Statefulset update strategy | `OnDelete` | | `priorityClassName` | Statefulsets Pod Priority | `` | | `extraLabels` | Labels to add to the Resources | `{}` | - +| `busyboxImage.repository` | Busybox initContainer image repo | `busybox` | +| `busyboxImage.tag` | Busybox initContainer image tag | `latest` | +| `busyboxImage.pullPolicy` | Busybox initContainer image pullPolicy | `Always` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, ```bash diff --git a/stable/rabbitmq-ha/templates/statefulset.yaml b/stable/rabbitmq-ha/templates/statefulset.yaml index ae0782d942..28ea87e0b4 100644 --- a/stable/rabbitmq-ha/templates/statefulset.yaml +++ b/stable/rabbitmq-ha/templates/statefulset.yaml @@ -46,7 +46,8 @@ spec: serviceAccountName: {{ template "rabbitmq-ha.serviceAccountName" . }} initContainers: - name: copy-rabbitmq-config - image: busybox + image: {{ .Values.busyboxImage.repository}}:{{ .Values.busyboxImage.tag}} + imagePullPolicy: {{ .Values.busyboxImage.pullPolicy }} command: ['sh', '-c', 'cp /configmap/* /etc/rabbitmq; rm -f /var/lib/rabbitmq/.erlang.cookie'] resources: {{ toYaml .Values.initContainer.resources | indent 12 }} diff --git a/stable/rabbitmq-ha/values.yaml b/stable/rabbitmq-ha/values.yaml index 362731008d..4d754fe608 100644 --- a/stable/rabbitmq-ha/values.yaml +++ b/stable/rabbitmq-ha/values.yaml @@ -248,6 +248,11 @@ image: # pullSecrets: # - myRegistrKeySecretName +busyboxImage: + repository: busybox + tag: latest + pullPolicy: Always + ## Duration in seconds the pod needs to terminate gracefully terminationGracePeriodSeconds: 10