Remove buggy and useless function-worker-config-map (#462)

Fixes #56
This commit is contained in:
Lari Hotari 2024-02-21 23:47:23 +02:00 committed by GitHub
parent 0e3251bea8
commit 17a4239733
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 38 deletions

View File

@ -125,8 +125,6 @@ data:
PF_functionRuntimeFactoryConfigs_pulsarAdminUrl: "https://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Values.broker.ports.https }}/" 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 }}/" PF_functionRuntimeFactoryConfigs_pulsarServiceUrl: "pulsar+ssl://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Values.broker.ports.pulsarssl }}/"
{{- end }} {{- end }}
PF_functionRuntimeFactoryConfigs_changeConfigMap: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}-config"
PF_functionRuntimeFactoryConfigs_changeConfigMapNamespace: {{ template "pulsar.namespace" . }}
# support version < 2.5.0 # support version < 2.5.0
PF_kubernetesContainerFactory_pulsarDockerImageName: "{{ template "pulsar.imageFullName" (dict "image" .Values.images.functions "root" .) }}" PF_kubernetesContainerFactory_pulsarDockerImageName: "{{ template "pulsar.imageFullName" (dict "image" .Values.images.functions "root" .) }}"
PF_kubernetesContainerFactory_submittingInsidePod: "true" 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_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 }}/" PF_kubernetesContainerFactory_pulsarServiceUrl: "pulsar+ssl://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Values.broker.ports.pulsarssl }}/"
{{- end }} {{- end }}
PF_kubernetesContainerFactory_changeConfigMap: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}-config"
PF_kubernetesContainerFactory_changeConfigMapNamespace: {{ template "pulsar.namespace" . }}
{{- end }} {{- end }}
# prometheus needs to access /metrics endpoint # prometheus needs to access /metrics endpoint

View File

@ -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 }}

View File

@ -805,6 +805,8 @@ broker:
# fieldPath: metadata.name # fieldPath: metadata.name
## Broker configmap ## Broker configmap
## templates/broker-configmap.yaml ## 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: configData:
PULSAR_MEM: > PULSAR_MEM: >
@ -827,6 +829,7 @@ broker:
managedLedgerDefaultEnsembleSize: "1" managedLedgerDefaultEnsembleSize: "1"
managedLedgerDefaultWriteQuorum: "1" managedLedgerDefaultWriteQuorum: "1"
managedLedgerDefaultAckQuorum: "1" managedLedgerDefaultAckQuorum: "1"
## Add a custom command to the start up process of the broker pods (e.g. update-ca-certificates, jvm commands, etc) ## Add a custom command to the start up process of the broker pods (e.g. update-ca-certificates, jvm commands, etc)
additionalCommand: additionalCommand:
## Broker service ## Broker service
@ -933,8 +936,8 @@ broker:
# gcsServiceAccountJsonFile: google-service-account-key.json # gcsServiceAccountJsonFile: google-service-account-key.json
## Pulsar: Functions Worker ## 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: functions:
component: functions-worker component: functions-worker
useBookieAsStateStore: false useBookieAsStateStore: false