pulsar-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From si...@apache.org
Subject [incubator-pulsar] branch master updated: fixed zookeeper name references in helm charts. (#2525)
Date Fri, 07 Sep 2018 19:25:26 GMT
This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 879c730  fixed zookeeper name references in helm charts. (#2525)
879c730 is described below

commit 879c730daf781ef27ad1344803ca97ad60cd4b62
Author: Victor <vli02@hotmail.com>
AuthorDate: Fri Sep 7 12:25:23 2018 -0700

    fixed zookeeper name references in helm charts. (#2525)
    
    ### Motivation
    
    zookeeper failed to start because of wrong ZOOKEEPER_SERVERS was set.
    
    ### Modifications
    
    Changed the reference of zookeeper names by how they were created.
    
    ### Result
    
    zookeeper started successfully and broker worked as expected.
---
 .../kubernetes/helm/pulsar/templates/autorecovery-configmap.yaml      | 2 +-
 deployment/kubernetes/helm/pulsar/templates/bookkeeper-configmap.yaml | 2 +-
 deployment/kubernetes/helm/pulsar/templates/broker-configmap.yaml     | 4 ++--
 deployment/kubernetes/helm/pulsar/templates/proxy-configmap.yaml      | 4 ++--
 .../kubernetes/helm/pulsar/templates/zookeeper-statefulset.yaml       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deployment/kubernetes/helm/pulsar/templates/autorecovery-configmap.yaml b/deployment/kubernetes/helm/pulsar/templates/autorecovery-configmap.yaml
index 2e25112..4200e6c 100644
--- a/deployment/kubernetes/helm/pulsar/templates/autorecovery-configmap.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/autorecovery-configmap.yaml
@@ -33,6 +33,6 @@ metadata:
 data:
   zkServers:
     {{- $global := . }}
-    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ printf "%s-%s-%s-%d.%s-%s-%s" $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component
$i $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component }}{{ end }}
+    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{
printf "%d" $i }}.{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component
}}{{ end }}
 {{ toYaml .Values.autoRecovery.configData | indent 2 }}
 {{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/bookkeeper-configmap.yaml b/deployment/kubernetes/helm/pulsar/templates/bookkeeper-configmap.yaml
index 31c66df..45a8546 100644
--- a/deployment/kubernetes/helm/pulsar/templates/bookkeeper-configmap.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/bookkeeper-configmap.yaml
@@ -32,7 +32,7 @@ metadata:
 data:
   zkServers:
     {{- $global := . }}
-    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ printf "%s-%s-%s-%d.%s-%s-%s" $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component
$i $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component }}{{ end }}
+    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{
printf "%d" $i }}.{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component
}}{{ end }}
   # disable auto recovery on bookies since we will start AutoRecovery in separated pods
   autoRecoveryDaemonEnabled: "false"
 {{ toYaml .Values.bookkeeper.configData | indent 2 }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/broker-configmap.yaml b/deployment/kubernetes/helm/pulsar/templates/broker-configmap.yaml
index 7d7df75..d577826 100644
--- a/deployment/kubernetes/helm/pulsar/templates/broker-configmap.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/broker-configmap.yaml
@@ -32,10 +32,10 @@ metadata:
 data:
   zookeeperServers:
     {{- $global := . }}
-    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ printf "%s-%s-%s-%d.%s-%s-%s" $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component
$i $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component }}{{ end }}
+    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{
printf "%d" $i }}.{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component
}}{{ end }}
   configurationStoreServers:
     {{- $global := . }}
-    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ printf "%s-%s-%s-%d.%s-%s-%s" $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component
$i $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component }}{{ end }}
+    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{
printf "%d" $i }}.{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component
}}{{ end }}
   clusterName: {{ template "pulsar.fullname" . }}
   functionsWorkerEnabled: "true"
   PF_pulsarFunctionsCluster: {{ template "pulsar.fullname" . }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/proxy-configmap.yaml b/deployment/kubernetes/helm/pulsar/templates/proxy-configmap.yaml
index 06051e4..4d9d3ad 100644
--- a/deployment/kubernetes/helm/pulsar/templates/proxy-configmap.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/proxy-configmap.yaml
@@ -33,10 +33,10 @@ metadata:
 data:
   zookeeperServers:
     {{- $global := . }}
-    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ printf "%s-%s-%s-%d.%s-%s-%s" $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component
$i $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component }}{{ end }}
+    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{
printf "%d" $i }}.{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component
}}{{ end }}
   configurationStoreServers:
     {{- $global := . }}
-    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ printf "%s-%s-%s-%d.%s-%s-%s" $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component
$i $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component }}{{ end }}
+    {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{
end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{
printf "%d" $i }}.{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component
}}{{ end }}
   clusterName: {{ template "pulsar.fullname" . }}
 {{ toYaml .Values.proxy.configData | indent 2 }}
 {{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/zookeeper-statefulset.yaml b/deployment/kubernetes/helm/pulsar/templates/zookeeper-statefulset.yaml
index bc71fe6..31bb511 100644
--- a/deployment/kubernetes/helm/pulsar/templates/zookeeper-statefulset.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/zookeeper-statefulset.yaml
@@ -103,7 +103,7 @@ spec:
         - name: ZOOKEEPER_SERVERS
           value:
             {{- $global := . }}
-            {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i
0 }},{{ end }}{{ printf "%s-%s-%s-%d" $global.Release.Name $global.Chart.Name $global.Values.zookeeper.component
$i }}{{ end }}
+            {{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i
0 }},{{ end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component
}}-{{ printf "%d" $i }}{{ end }}
         envFrom:
         - configMapRef:
             name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}"


Mime
View raw message