This is an automated email from the ASF dual-hosted git repository.
nicknezis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new f764d9a Reordering the init containers in the Helm chart (#3589)
f764d9a is described below
commit f764d9ad48c323f9980445431788503fe2100812
Author: Nicholas Nezis <[email protected]>
AuthorDate: Wed Jul 29 01:55:12 2020 -0400
Reordering the init containers in the Helm chart (#3589)
---
deploy/kubernetes/helm/templates/bookie.yaml | 30 ++++++++++++++--------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/deploy/kubernetes/helm/templates/bookie.yaml
b/deploy/kubernetes/helm/templates/bookie.yaml
index 09ceff2..238f60a 100644
--- a/deploy/kubernetes/helm/templates/bookie.yaml
+++ b/deploy/kubernetes/helm/templates/bookie.yaml
@@ -112,21 +112,6 @@ spec:
{{- end }}
terminationGracePeriodSeconds: 0
initContainers:
-{{- if eq .Values.platform "minikube" }}
- # The first time, initialize BK to wipe data for minikube
- - name: bookie-format
- image: {{ .Values.bookkeeper.image }}
- args: ["/opt/bookkeeper/bin/bookkeeper", "shell", "bookieformat",
"-nonInteractive", "-force"]
- command: [ "/bin/bash", "/opt/bookkeeper/scripts/entrypoint.sh" ]
- envFrom:
- - configMapRef:
- name: {{ .Release.Name }}-bookie-config
- volumeMounts:
- - name: journal-disk
- mountPath: /bookkeeper/data/journal
- - name: ledgers-disk
- mountPath: /bookkeeper/data/ledgers
-{{- end }}
# Wait until the zookeeper pods are up and running
- name: bookie-init-container
image: {{ .Values.image }} # use heron image until bookkeeper has nc
@@ -143,6 +128,21 @@ spec:
echo 'Zookeeper {{ .Release.Name }}-zookeeper:{{
.Values.zookeeper.clientPort }} not ready';
sleep 4;
done
+{{- if eq .Values.platform "minikube" }}
+ # The first time, initialize BK to wipe data for minikube
+ - name: bookie-format
+ image: {{ .Values.bookkeeper.image }}
+ args: ["/opt/bookkeeper/bin/bookkeeper", "shell", "bookieformat",
"-nonInteractive", "-force"]
+ command: [ "/bin/bash", "/opt/bookkeeper/scripts/entrypoint.sh" ]
+ envFrom:
+ - configMapRef:
+ name: {{ .Release.Name }}-bookie-config
+ volumeMounts:
+ - name: journal-disk
+ mountPath: /bookkeeper/data/journal
+ - name: ledgers-disk
+ mountPath: /bookkeeper/data/ledgers
+{{- end }}
containers:
- name: bookie
image: {{ .Values.bookkeeper.image }}
