Skip to content

Commit fa1456e

Browse files
authored
configurable oxia coordinator configmap and entrypoint (#606)
1 parent 8382906 commit fa1456e

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

charts/pulsar/templates/_oxia.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,11 @@ Define coordinator entrypoint
106106
{{- define "oxia.coordinator.entrypoint" -}}
107107
- "oxia"
108108
- "coordinator"
109+
{{- if .Values.oxia.coordinator.customConfigMapName }}
110+
- "--conf=configmap:{{ template "pulsar.namespace" . }}/{{ .Values.oxia.coordinator.customConfigMapName }}"
111+
{{- else }}
109112
- "--conf=configmap:{{ template "pulsar.namespace" . }}/{{ template "pulsar.fullname" . }}-{{ .Values.oxia.component }}-coordinator"
113+
{{- end }}
110114
- "--log-json"
111115
- "--metadata=configmap"
112116
- "--k8s-namespace={{ template "pulsar.namespace" . }}"

charts/pulsar/templates/oxia-coordinator-configmap.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# specific language governing permissions and limitations
1717
# under the License.
1818
#
19-
{{- if .Values.components.oxia }}
19+
{{- if and .Values.components.oxia (not .Values.oxia.coordinator.customConfigMapName) }}
2020
apiVersion: v1
2121
kind: ConfigMap
2222
metadata:
@@ -29,4 +29,4 @@ data:
2929
config.yaml: |
3030
{{- include "oxia.coordinator.config.yaml" . | nindent 4 }}
3131
32-
{{- end }}
32+
{{- end }}

charts/pulsar/templates/oxia-coordinator-deployment.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,22 @@ spec:
4949
{{ toYaml . | indent 8 }}
5050
{{- end }}
5151
spec:
52-
{{- if .Values.oxia.server.nodeSelector }}
52+
{{- if .Values.oxia.coordinator.nodeSelector }}
5353
nodeSelector:
54-
{{ toYaml .Values.oxia.server.nodeSelector | indent 8 }}
54+
{{ toYaml .Values.oxia.coordinator.nodeSelector | indent 8 }}
5555
{{- end }}
56-
{{- if .Values.oxia.server.tolerations }}
56+
{{- if .Values.oxia.coordinator.tolerations }}
5757
tolerations:
58-
{{ toYaml .Values.oxia.server.tolerations | indent 8 }}
58+
{{ toYaml .Values.oxia.coordinator.tolerations | indent 8 }}
5959
{{- end }}
6060
serviceAccountName: {{ template "pulsar.fullname" . }}-{{ .Values.oxia.component }}-coordinator
6161
containers:
6262
- command:
63+
{{- if .Values.oxia.coordinator.entrypoint }}
64+
{{ toYaml .Values.oxia.coordinator.entrypoint | indent 12 }}
65+
{{- else }}
6366
{{- include "oxia.coordinator.entrypoint" . | nindent 12 }}
67+
{{- end }}
6468
image: "{{ .Values.images.oxia.repository }}:{{ .Values.images.oxia.tag }}"
6569
imagePullPolicy: "{{ template "pulsar.imagePullPolicy" (dict "image" .Values.images.oxia "root" .) }}"
6670
name: coordinator

charts/pulsar/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,8 @@ oxia:
525525
tolerations: []
526526
# nodeSelector:
527527
# cloud.google.com/gke-nodepool: default-pool
528+
# customConfigMapName: ""
529+
# entrypoint: []
528530
## templates/server-statefulset.yaml
529531
server:
530532
# annotations for the app (statefulset/deployment)

0 commit comments

Comments
 (0)