[incubator-heron] branch master updated: Remove unnecessary Bookkeeper format init container from Helm chart (#3795)

[ni...@apache.org]

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 ef20cf5  Remove unnecessary Bookkeeper format init container from Helm chart (#3795)
ef20cf5 is described below

commit ef20cf51eda12fe0fdd549a2ebcce379d356b455
Author: Nicholas Nezis <ni...@gmail.com>
AuthorDate: Sat Mar 19 19:49:21 2022 -0400

    Remove unnecessary Bookkeeper format init container from Helm chart (#3795)
    
    Co-authored-by: Billy Romansky <wr...@protonmail.com>
---
 deploy/kubernetes/helm/Chart.yaml.template   |  2 +-
 deploy/kubernetes/helm/templates/bookie.yaml | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/deploy/kubernetes/helm/Chart.yaml.template b/deploy/kubernetes/helm/Chart.yaml.template
index 458d7e0..a1f4d9e 100644
--- a/deploy/kubernetes/helm/Chart.yaml.template
+++ b/deploy/kubernetes/helm/Chart.yaml.template
@@ -18,7 +18,7 @@
 apiVersion: v2
 name: heron
 version: VERSION
-kubeVersion: >= 1.16
+kubeVersion: ">=1.16"
 appVersion: VERSION
 description: Heron is a fast distributed streaming engine for processing large data volumes with velocity
 type: application
diff --git a/deploy/kubernetes/helm/templates/bookie.yaml b/deploy/kubernetes/helm/templates/bookie.yaml
index 8ed27ed..abd6b51 100644
--- a/deploy/kubernetes/helm/templates/bookie.yaml
+++ b/deploy/kubernetes/helm/templates/bookie.yaml
@@ -112,8 +112,8 @@ spec:
                       values:
                         - {{ .Release.Name }}-bookkeeper
                 topologyKey: "kubernetes.io/hostname"
-{{- end }}
       terminationGracePeriodSeconds: 0
+{{- end }}
       initContainers:
         # Wait until the zookeeper pods are up and running
         - name: bookie-init-container
@@ -131,21 +131,6 @@ 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 }}