This is an automated email from the ASF dual-hosted git repository.
nwang 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 d0f647f Bug/heron-helm (#3289)
d0f647f is described below
commit d0f647f79a4fbb4afa39156dd5c09619f5752150
Author: Scott <[email protected]>
AuthorDate: Thu Jun 20 16:55:43 2019 -0400
Bug/heron-helm (#3289)
* fix inconsistent volume names and init container
* package names and spacing fix
* fix string comparison init container
could have also used double brackets
* fix prometheus stats provider class name
---
deploy/kubernetes/helm/templates/bookie.yaml | 10 +++++-----
deploy/kubernetes/helm/templates/tools.yaml | 14 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/deploy/kubernetes/helm/templates/bookie.yaml
b/deploy/kubernetes/helm/templates/bookie.yaml
index 76e5d9a..15294e6 100644
--- a/deploy/kubernetes/helm/templates/bookie.yaml
+++ b/deploy/kubernetes/helm/templates/bookie.yaml
@@ -42,7 +42,7 @@ data:
BK_zkServers: {{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.clientPort
}}
BK_autoRecoveryDaemonEnabled: "true"
# TODO: Issue 458: https://github.com/apache/bookkeeper/issues/458
- #BK_statsProviderClass: org.apache.bookkeeper.stats.PrometheusMetricsProvider
+ #BK_statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
---
## BookKeeper servers need to access the local disks and the pods
@@ -101,7 +101,7 @@ spec:
initContainers:
# Wait until the zookeeper pods are up and running
- name: bookie-init-container
- image: {{ .Values.bookkeeper.image }}
+ image: {{ .Values.image }} # use heron image until bookkeeper has nc
command:
- sh
- -c
@@ -109,7 +109,7 @@ spec:
while true; do
status=$(echo ruok | nc {{ .Release.Name }}-zookeeper {{
.Values.zookeeper.clientPort }});
writestatus=$(echo isro | nc {{ .Release.Name }}-zookeeper {{
.Values.zookeeper.clientPort }})
- if [ "$status" = "imok" ] && [ "$writestatus" == "rw" ]; then
+ if [ "$status" = "imok" ] && [ "$writestatus" = "rw" ]; then
break;
fi;
echo 'Zookeeper {{ .Release.Name }}-zookeeper:{{
.Values.zookeeper.clientPort }} not ready';
@@ -138,7 +138,7 @@ spec:
volumeMounts:
- name: journal-disk
mountPath: /bookkeeper/data/journal
- - name: data-disk
+ - name: ledgers-disk
mountPath: /bookkeeper/data/ledgers
{{- if or (eq .Values.platform "aws") (eq .Values.platform "baremetal") }}
@@ -166,7 +166,7 @@ spec:
requests:
storage: {{ $bookieJournalCapacity }}
- metadata:
- name: data-disk
+ name: ledgers-disk
annotations:
volume.alpha.kubernetes.io/storage-class: default
labels:
diff --git a/deploy/kubernetes/helm/templates/tools.yaml
b/deploy/kubernetes/helm/templates/tools.yaml
index a6b8287..cc2dbeb 100644
--- a/deploy/kubernetes/helm/templates/tools.yaml
+++ b/deploy/kubernetes/helm/templates/tools.yaml
@@ -17,7 +17,7 @@
{{- $platform := .Values.platform -}}
{{- $jobReplicas := .Values.jobReplicas -}}
-{{- $apiServerMemory := .Values.apiServerMemory -}}
+{{- $apiServerMemory := .Values.apiServerMemory }}
apiVersion: v1
kind: ConfigMap
@@ -70,7 +70,7 @@ spec:
- /opt/zookeeper/scripts/wait-for-zookeeper.sh {{ .Release.Name
}}-zookeeper {{ .Values.zookeeper.clientPort }}
- name: init-heron-apiserver
image: {{ .Values.bookkeeper.image }}
- command: ['sh', '-c', '/opt/bookkeeper/bin/dlog admin bind -l
/ledgers -s {{ .Release.Name }}-zookeeper {{ .Values.zookeeper.clientPort
}}:2181 -c distributedlog://{{ .Release.Name }}-zookeeper {{
.Values.zookeeper.clientPort }}/heron']
+ command: ['sh', '-c', '/opt/bookkeeper/bin/dlog admin bind -l
/ledgers -s {{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.clientPort }} -c
distributedlog://{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.clientPort
}}/heron']
containers:
- name: heron-tracker
image: {{ .Values.image }}
@@ -131,11 +131,11 @@ spec:
-D heron.kubernetes.scheduler.namespace={{ .Release.Namespace }}
-D heron.executor.docker.image={{ .Values.image }}
-D
heron.statefulstorage.classname=org.apache.heron.statefulstorage.dlog.DlogStorage
- -D heron.statefulstorage.dlog.namespace.uri=distributedlog://{{
.Release.Name }}-zookeeper {{ .Values.zookeeper.clientPort }}/heron
+ -D heron.statefulstorage.dlog.namespace.uri=distributedlog://{{
.Release.Name }}-zookeeper:{{ .Values.zookeeper.clientPort }}/heron
{{- if eq .Values.uploader.class "dlog" }}
- -D heron.class.uploader=org.apache.heron.uploader.dlog.DLUploader
+ -D
heron.class.uploader=com.twitter.heron.uploader.dlog.DLUploader
-D heron.uploader.dlog.topologies.num.replicas={{ $jobReplicas }}
- -D
heron.uploader.dlog.topologies.namespace.uri=distributedlog://{{ .Release.Name
}}-zookeeper {{ .Values.zookeeper.clientPort }}/heron
+ -D
heron.uploader.dlog.topologies.namespace.uri=distributedlog://{{ .Release.Name
}}-zookeeper:{{ .Values.zookeeper.clientPort }}/heron
{{- else if eq .Values.uploader.class "s3" }}
-D heron.class.uploader=org.apache.heron.uploader.s3.S3Uploader
-D heron.uploader.s3.bucket={{ .Values.uploader.s3Bucket }}
@@ -145,8 +145,8 @@ spec:
-D heron.uploader.s3.region={{ .Values.uploader.s3Region }}
{{- end }}
{{- if eq .Values.packing "RoundRobin" }}
- -D
heron.class.packing.algorithm=org.apache.heron.packing.roundrobin.RoundRobinPacking
- -D
heron.class.repacking.algorithm=org.apache.heron.packing.roundrobin.RoundRobinPacking
+ -D
heron.class.packing.algorithm=com.twitter.heron.packing.roundrobin.RoundRobinPacking
+ -D
heron.class.repacking.algorithm=com.twitter.heron.packing.roundrobin.RoundRobinPacking
{{- else if eq .Values.packing "ResourceCompliantRR" }}
-D
heron.class.packing.algorithm=org.apache.heron.packing.roundrobin.ResourceCompliantRRPacking
-D
heron.class.repacking.algorithm=org.apache.heron.packing.roundrobin.ResourceCompliantRRPacking
