This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new 17a4239 Remove buggy and useless function-worker-config-map (#462)
17a4239 is described below
commit 17a42397334cf0c8fb93760535475b484e027a8f
Author: Lari Hotari <[email protected]>
AuthorDate: Wed Feb 21 23:47:23 2024 +0200
Remove buggy and useless function-worker-config-map (#462)
Fixes #56
---
charts/pulsar/templates/broker-configmap.yaml | 4 ---
.../templates/function-worker-configmap.yaml | 32 ----------------------
charts/pulsar/values.yaml | 7 +++--
3 files changed, 5 insertions(+), 38 deletions(-)
diff --git a/charts/pulsar/templates/broker-configmap.yaml
b/charts/pulsar/templates/broker-configmap.yaml
index c9160d6..40f01b8 100644
--- a/charts/pulsar/templates/broker-configmap.yaml
+++ b/charts/pulsar/templates/broker-configmap.yaml
@@ -125,8 +125,6 @@ data:
PF_functionRuntimeFactoryConfigs_pulsarAdminUrl: "https://{{ template
"pulsar.fullname" . }}-{{ .Values.broker.component }}:{{
.Values.broker.ports.https }}/"
PF_functionRuntimeFactoryConfigs_pulsarServiceUrl: "pulsar+ssl://{{ template
"pulsar.fullname" . }}-{{ .Values.broker.component }}:{{
.Values.broker.ports.pulsarssl }}/"
{{- end }}
- PF_functionRuntimeFactoryConfigs_changeConfigMap: "{{ template
"pulsar.fullname" . }}-{{ .Values.functions.component }}-config"
- PF_functionRuntimeFactoryConfigs_changeConfigMapNamespace: {{ template
"pulsar.namespace" . }}
# support version < 2.5.0
PF_kubernetesContainerFactory_pulsarDockerImageName: "{{ template
"pulsar.imageFullName" (dict "image" .Values.images.functions "root" .) }}"
PF_kubernetesContainerFactory_submittingInsidePod: "true"
@@ -140,8 +138,6 @@ data:
PF_kubernetesContainerFactory_pulsarAdminUrl: "https://{{ template
"pulsar.fullname" . }}-{{ .Values.broker.component }}:{{
.Values.broker.ports.https }}/"
PF_kubernetesContainerFactory_pulsarServiceUrl: "pulsar+ssl://{{ template
"pulsar.fullname" . }}-{{ .Values.broker.component }}:{{
.Values.broker.ports.pulsarssl }}/"
{{- end }}
- PF_kubernetesContainerFactory_changeConfigMap: "{{ template
"pulsar.fullname" . }}-{{ .Values.functions.component }}-config"
- PF_kubernetesContainerFactory_changeConfigMapNamespace: {{ template
"pulsar.namespace" . }}
{{- end }}
# prometheus needs to access /metrics endpoint
diff --git a/charts/pulsar/templates/function-worker-configmap.yaml
b/charts/pulsar/templates/function-worker-configmap.yaml
deleted file mode 100644
index 653cc00..0000000
--- a/charts/pulsar/templates/function-worker-configmap.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-{{- if .Values.components.functions }}
-## function config map
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component
}}-config"
- namespace: {{ template "pulsar.namespace" . }}
- labels:
- {{- include "pulsar.standardLabels" . | nindent 4 }}
- component: {{ .Values.functions.component }}
-data:
- pulsarDockerImageName: "{{ template "pulsar.imageFullName" (dict "image"
.Values.images.functions "root" .) }}"
-{{- end }}
diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
index dcba387..f64c050 100644
--- a/charts/pulsar/values.yaml
+++ b/charts/pulsar/values.yaml
@@ -805,6 +805,8 @@ broker:
# fieldPath: metadata.name
## Broker configmap
## templates/broker-configmap.yaml
+ ## Keys in broker.conf can be overridden here. Use PULSAR_PREFIX_ to add
keys to broker.conf.
+ ## In addition, keys in function_worker.yml can be overridden using the PF_
prefix, with _ serving as the key path separator.
##
configData:
PULSAR_MEM: >
@@ -827,6 +829,7 @@ broker:
managedLedgerDefaultEnsembleSize: "1"
managedLedgerDefaultWriteQuorum: "1"
managedLedgerDefaultAckQuorum: "1"
+
## Add a custom command to the start up process of the broker pods (e.g.
update-ca-certificates, jvm commands, etc)
additionalCommand:
## Broker service
@@ -933,8 +936,8 @@ broker:
# gcsServiceAccountJsonFile: google-service-account-key.json
## Pulsar: Functions Worker
-## templates/function-worker-configmap.yaml
-##
+## The Function Worker component runs embedded with the broker
+## Configuration for the function worker is set in the broker configmap with
keys prefixed by `PF_`.
functions:
component: functions-worker
useBookieAsStateStore: false
