This is an automated email from the ASF dual-hosted git repository.
zhouky pushed a commit to branch branch-0.2
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/branch-0.2 by this push:
new db61c3aa5 [CELEBORN-343] Add configuration for k8s cluster name (#1269)
db61c3aa5 is described below
commit db61c3aa5ca8c0e275f125857a0268376578de76
Author: liugs0213 <[email protected]>
AuthorDate: Mon Feb 27 17:48:16 2023 +0800
[CELEBORN-343] Add configuration for k8s cluster name (#1269)
---
docker/helm/templates/configmap.yaml | 4 ++--
docker/helm/templates/master-statefulset.yaml | 2 +-
docker/helm/templates/worker-statefulset.yaml | 2 +-
docker/helm/values.yaml | 3 +++
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/docker/helm/templates/configmap.yaml
b/docker/helm/templates/configmap.yaml
index 7a6a5bacb..567247908 100644
--- a/docker/helm/templates/configmap.yaml
+++ b/docker/helm/templates/configmap.yaml
@@ -25,9 +25,9 @@ data:
celeborn-defaults.conf: |-
{{- $namespace := .Release.Namespace }}
celeborn.ha.enabled=true
- celeborn.master.endpoints={{ range until (.Values.masterReplicas |int)
}}celeborn-master-{{ . }}.celeborn-master-svc.{{ $namespace
}}.svc.cluster.local,{{ end }}
+ celeborn.master.endpoints={{ range until (.Values.masterReplicas |int)
}}celeborn-master-{{ . }}.celeborn-master-svc.{{ $namespace }}.svc.{{
$.Values.cluster.name }}.local,{{ end }}
{{- range until (.Values.masterReplicas |int) }}
- celeborn.ha.master.node.{{ . }}.host=celeborn-master-{{ .
}}.celeborn-master-svc.{{ $namespace }}.svc.cluster.local
+ celeborn.ha.master.node.{{ . }}.host=celeborn-master-{{ .
}}.celeborn-master-svc.{{ $namespace }}.svc.{{ $.Values.cluster.name }}.local
{{- end }}
{{- range $key, $val := .Values.celeborn }}
{{ $key }}={{ $val }}
diff --git a/docker/helm/templates/master-statefulset.yaml
b/docker/helm/templates/master-statefulset.yaml
index 83de610a9..a76025e4c 100644
--- a/docker/helm/templates/master-statefulset.yaml
+++ b/docker/helm/templates/master-statefulset.yaml
@@ -69,7 +69,7 @@ spec:
- "--"
- "/bin/sh"
- '-c'
- - "until {{ range until (.Values.masterReplicas |int) }}nslookup
celeborn-master-{{ . }}.celeborn-master-svc && {{ end }}true; do echo waiting
for master; sleep 2; done && /opt/celeborn/sbin/start-master.sh"
+ - "until {{ range until (.Values.masterReplicas |int) }}nslookup
celeborn-master-{{ . }}.celeborn-master-svc.svc.{{ $.Values.cluster.name
}}.local && {{ end }}true; do echo waiting for master; sleep 2; done &&
/opt/celeborn/sbin/start-master.sh"
resources:
{{- toYaml .Values.resources.master | nindent 12 }}
ports:
diff --git a/docker/helm/templates/worker-statefulset.yaml
b/docker/helm/templates/worker-statefulset.yaml
index 4b407880c..71024a527 100644
--- a/docker/helm/templates/worker-statefulset.yaml
+++ b/docker/helm/templates/worker-statefulset.yaml
@@ -69,7 +69,7 @@ spec:
- "--"
- "/bin/sh"
- '-c'
- - "until {{ range until (.Values.masterReplicas |int) }}nslookup
celeborn-master-{{ . }}.celeborn-master-svc && {{ end }}true; do echo waiting
for master; sleep 2; done && /opt/celeborn/sbin/start-worker.sh"
+ - "until {{ range until (.Values.masterReplicas |int) }}nslookup
celeborn-master-{{ . }}.celeborn-master-svc.svc.{{ $.Values.cluster.name
}}.local && {{ end }}true; do echo waiting for master; sleep 2; done &&
/opt/celeborn/sbin/start-worker.sh"
resources:
{{- toYaml .Values.resources.worker | nindent 12 }}
ports:
diff --git a/docker/helm/values.yaml b/docker/helm/values.yaml
index 33323512b..543bc9b3f 100644
--- a/docker/helm/values.yaml
+++ b/docker/helm/values.yaml
@@ -79,6 +79,9 @@ service:
type: ClusterIP
port: 9097
+cluster:
+ name: cluster
+
configmap: celeborn-conf
resources: {}
