Remove buggy and useless function-worker-config-map

Fixes apache#56
lhotari · Feb 21, 2024 · d55016d · d55016d
1 parent 0e3251b
commit d55016d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 38 deletions.
diff --git 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
diff --git 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