Skip to content

Commit 6c9856a

Browse files
authored
Use .Release.Namespace by default to handle namespaces (#80)
It remains possible to override the current release namespace by setting the `namespace` value though this may lead to having the helm metadata and the pulsar components in different namespaces Fixes #66 ### Motivation Trying to deploy the chart in a namespace using the usual helm pattern fails for example ``` kubectl create ns pulsartest helm upgrade --install pulsar -n pulsartest apache/pulsar Error: namespaces "pulsar" not found ``` fixing that while keeping the helm metadata and the deployed objects in the same namespace requires declaring the namespace twice ``` kubectl create ns pulsartest helm upgrade --install pulsar -n pulsartest apache/pulsar --set namespace=pulsartest Error: namespaces "pulsar" not found ``` This is needlessly confusing for newcomers who follow the helm documentation and is contrary to helm best practices. ### Modifications I changed the chart to use the context namespace `.Release.Namespace` by default while preserving the ability to override that by explicitly providing a namespace on the commande line, with the this modification both examples behave as expected ### Verifying this change - [x] Make sure that the change passes the CI checks.
1 parent eb63a19 commit 6c9856a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+113
-102
lines changed

Diff for: .ci/helm.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ function ci::install_pulsar_chart() {
7878
${KUBECTL} create namespace ${NAMESPACE}
7979
echo ${CHARTS_HOME}/scripts/pulsar/prepare_helm_release.sh -k ${CLUSTER} -n ${NAMESPACE} ${extra_opts}
8080
${CHARTS_HOME}/scripts/pulsar/prepare_helm_release.sh -k ${CLUSTER} -n ${NAMESPACE} ${extra_opts}
81-
${CHARTS_HOME}/scripts/pulsar/upload_tls.sh -k ${CLUSTER} -d ${PULSAR_HOME}/.ci/tls
81+
${CHARTS_HOME}/scripts/pulsar/upload_tls.sh -k ${CLUSTER} -n ${NAMESPACE} -d ${PULSAR_HOME}/.ci/tls
8282
sleep 10
8383

8484
echo ${HELM} install --set initialize=true --values ${value_file} ${CLUSTER} ${CHARTS_HOME}/charts/pulsar
8585
${HELM} template --values ${value_file} ${CLUSTER} ${CHARTS_HOME}/charts/pulsar
86-
${HELM} install --set initialize=true --values ${value_file} ${CLUSTER} ${CHARTS_HOME}/charts/pulsar
86+
${HELM} install --set initialize=true --values ${value_file} --namespace=${NAMESPACE} ${CLUSTER} ${CHARTS_HOME}/charts/pulsar
8787

8888
echo "wait until broker is alive"
8989
WC=$(${KUBECTL} get pods -n ${NAMESPACE} --field-selector=status.phase=Running | grep ${CLUSTER}-broker | wc -l)
@@ -161,4 +161,4 @@ function ci::test_pulsar_function() {
161161
# ci::wait_function_running
162162
# ${KUBECTL} exec -n ${NAMESPACE} ${CLUSTER}-toolset-0 -- bin/pulsar-client produce -m "hello pulsar function!" pulsar-ci/test/test_input
163163
# ci::wait_message_processed
164-
}
164+
}

Diff for: charts/pulsar/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apiVersion: v1
2121
appVersion: "2.6.2"
2222
description: Apache Pulsar Helm chart for Kubernetes
2323
name: pulsar
24-
version: 2.6.2-1
24+
version: 2.6.2-2
2525
home: https://pulsar.apache.org
2626
sources:
2727
- https://github.com/apache/pulsar

Diff for: charts/pulsar/templates/_autorecovery.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Define the pulsar autorecovery service
99
Define the autorecovery hostname
1010
*/}}
1111
{{- define "pulsar.autorecovery.hostname" -}}
12-
${HOSTNAME}.{{ template "pulsar.autorecovery.service" . }}.{{ .Values.namespace }}.svc.{{ .Values.clusterDomain }}
12+
${HOSTNAME}.{{ template "pulsar.autorecovery.service" . }}.{{ template "pulsar.namespace" . }}.svc.{{ .Values.clusterDomain }}
1313
{{- end -}}
1414

1515
{{/*

Diff for: charts/pulsar/templates/_bookkeeper.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Define the pulsar bookkeeper service
99
Define the bookkeeper hostname
1010
*/}}
1111
{{- define "pulsar.bookkeeper.hostname" -}}
12-
${HOSTNAME}.{{ template "pulsar.bookkeeper.service" . }}.{{ .Values.namespace }}.svc.{{ .Values.clusterDomain }}
12+
${HOSTNAME}.{{ template "pulsar.bookkeeper.service" . }}.{{ template "pulsar.namespace" . }}.svc.{{ .Values.clusterDomain }}
1313
{{- end -}}
1414

1515

Diff for: charts/pulsar/templates/_broker.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Define the pulsar brroker service
99
Define the hostname
1010
*/}}
1111
{{- define "pulsar.broker.hostname" -}}
12-
${HOSTNAME}.{{ template "pulsar.broker.service" . }}.{{ .Values.namespace }}.svc.{{ .Values.clusterDomain }}
12+
${HOSTNAME}.{{ template "pulsar.broker.service" . }}.{{ template "pulsar.namespace" . }}.svc.{{ .Values.clusterDomain }}
1313
{{- end -}}
1414

1515
{{/*

Diff for: charts/pulsar/templates/_helpers.tpl

+7
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ Expand the name of the chart.
1414
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
1515
{{- end -}}
1616

17+
{{/*
18+
Expand the namespace of the chart.
19+
*/}}
20+
{{- define "pulsar.namespace" -}}
21+
{{- default .Release.Namespace .Values.namespace -}}
22+
{{- end -}}
23+
1724
{{/*
1825
Create a default fully qualified app name.
1926
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

Diff for: charts/pulsar/templates/_toolset.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Define the pulsar toolset service
99
Define the toolset hostname
1010
*/}}
1111
{{- define "pulsar.toolset.hostname" -}}
12-
${HOSTNAME}.{{ template "pulsar.toolset.service" . }}.{{ .Values.namespace }}.svc.{{ .Values.clusterDomain }}
12+
${HOSTNAME}.{{ template "pulsar.toolset.service" . }}.{{ template "pulsar.namespace" . }}.svc.{{ .Values.clusterDomain }}
1313
{{- end -}}
1414

1515
{{/*

Diff for: charts/pulsar/templates/_zookeeper.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Define the pulsar zookeeper
2626
Define the zookeeper hostname
2727
*/}}
2828
{{- define "pulsar.zookeeper.hostname" -}}
29-
${HOSTNAME}.{{ template "pulsar.zookeeper.service" . }}.{{ .Values.namespace }}.svc.{{ .Values.clusterDomain }}
29+
${HOSTNAME}.{{ template "pulsar.zookeeper.service" . }}.{{ template "pulsar.namespace" . }}.svc.{{ .Values.clusterDomain }}
3030
{{- end -}}
3131

3232
{{/*

Diff for: charts/pulsar/templates/autorecovery-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: ConfigMap
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.autorecovery.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.autorecovery.component }}

Diff for: charts/pulsar/templates/autorecovery-service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: Service
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.autorecovery.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.autorecovery.component }}

Diff for: charts/pulsar/templates/autorecovery-statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: apps/v1
2222
kind: StatefulSet
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.autorecovery.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.autorecovery.component }}

Diff for: charts/pulsar/templates/bookkeeper-cluster-initialize.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: batch/v1
2222
kind: Job
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}-init"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: "{{ .Values.bookkeeper.component }}-init"
@@ -41,7 +41,7 @@ spec:
4141
echo "user provided zookeepers {{ $zk }} are unreachable... check in 3 seconds ..." && sleep 3;
4242
done;
4343
{{ else }}
44-
until nslookup {{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}-{{ add (.Values.zookeeper.replicaCount | int) -1 }}.{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}.{{ .Values.namespace }}; do
44+
until nslookup {{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}-{{ add (.Values.zookeeper.replicaCount | int) -1 }}.{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}.{{ template "pulsar.namespace" . }}; do
4545
sleep 3;
4646
done;
4747
{{- end}}

Diff for: charts/pulsar/templates/bookkeeper-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: ConfigMap
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.bookkeeper.component }}

Diff for: charts/pulsar/templates/bookkeeper-pdb.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ apiVersion: policy/v1beta1
2323
kind: PodDisruptionBudget
2424
metadata:
2525
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}"
26-
namespace: {{ .Values.namespace }}
26+
namespace: {{ template "pulsar.namespace" . }}
2727
labels:
2828
{{- include "pulsar.standardLabels" . | nindent 4 }}
2929
component: {{ .Values.bookkeeper.component }}

Diff for: charts/pulsar/templates/bookkeeper-service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: Service
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.bookkeeper.component }}

Diff for: charts/pulsar/templates/bookkeeper-statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: apps/v1
2222
kind: StatefulSet
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.bookkeeper.component }}

Diff for: charts/pulsar/templates/bookkeeper-storageclass.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ apiVersion: storage.k8s.io/v1
2424
kind: StorageClass
2525
metadata:
2626
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}-{{ .Values.bookkeeper.volumes.journal.name }}"
27-
namespace: {{ .Values.namespace }}
27+
namespace: {{ template "pulsar.namespace" . }}
2828
labels:
2929
{{- include "pulsar.standardLabels" . | nindent 4 }}
3030
component: {{ .Values.bookkeeper.component }}
@@ -40,7 +40,7 @@ apiVersion: storage.k8s.io/v1
4040
kind: StorageClass
4141
metadata:
4242
name: "{{ template "pulsar.fullname" . }}-{{ .Values.bookkeeper.component }}-{{ .Values.bookkeeper.volumes.ledgers.name }}"
43-
namespace: {{ .Values.namespace }}
43+
namespace: {{ template "pulsar.namespace" . }}
4444
labels:
4545
{{- include "pulsar.standardLabels" . | nindent 4 }}
4646
component: {{ .Values.bookkeeper.component }}

Diff for: charts/pulsar/templates/broker-cluster-role-binding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ roleRef:
3232
subjects:
3333
- kind: ServiceAccount
3434
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-acct"
35-
namespace: {{ .Values.namespace }}
35+
namespace: {{ template "pulsar.namespace" . }}
3636
---
3737

3838
apiVersion: rbac.authorization.k8s.io/v1beta1

Diff for: charts/pulsar/templates/broker-configmap.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: ConfigMap
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.broker.component }}
@@ -61,7 +61,7 @@ data:
6161
PF_functionRuntimeFactoryConfigs_pulsarDockerImageName: "{{ .Values.images.functions.repository }}:{{ .Values.images.functions.tag }}"
6262
PF_functionRuntimeFactoryConfigs_submittingInsidePod: "true"
6363
PF_functionRuntimeFactoryConfigs_installUserCodeDependencies: "true"
64-
PF_functionRuntimeFactoryConfigs_jobNamespace: {{ .Values.namespace }}
64+
PF_functionRuntimeFactoryConfigs_jobNamespace: {{ template "pulsar.namespace" . }}
6565
PF_functionRuntimeFactoryConfigs_expectedMetricsCollectionInterval: "30"
6666
{{- if not (and .Values.tls.enabled .Values.tls.broker.enabled) }}
6767
PF_functionRuntimeFactoryConfigs_pulsarAdminUrl: "http://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Values.broker.ports.http }}/"
@@ -72,12 +72,12 @@ data:
7272
PF_functionRuntimeFactoryConfigs_pulsarServiceUrl: "pulsar+ssl://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Values.broker.ports.pulsarssl }}/"
7373
{{- end }}
7474
PF_functionRuntimeFactoryConfigs_changeConfigMap: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}-config"
75-
PF_functionRuntimeFactoryConfigs_changeConfigMapNamespace: {{ .Values.namespace }}
75+
PF_functionRuntimeFactoryConfigs_changeConfigMapNamespace: {{ template "pulsar.namespace" . }}
7676
# support version < 2.5.0
7777
PF_kubernetesContainerFactory_pulsarDockerImageName: "{{ .Values.images.functions.repository }}:{{ .Values.images.functions.tag }}"
7878
PF_kubernetesContainerFactory_submittingInsidePod: "true"
7979
PF_kubernetesContainerFactory_installUserCodeDependencies: "true"
80-
PF_kubernetesContainerFactory_jobNamespace: {{ .Values.namespace }}
80+
PF_kubernetesContainerFactory_jobNamespace: {{ template "pulsar.namespace" . }}
8181
PF_kubernetesContainerFactory_expectedMetricsCollectionInterval: "30"
8282
{{- if not (and .Values.tls.enabled .Values.tls.broker.enabled) }}
8383
PF_kubernetesContainerFactory_pulsarAdminUrl: "http://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Values.broker.ports.http }}/"
@@ -88,7 +88,7 @@ data:
8888
PF_kubernetesContainerFactory_pulsarServiceUrl: "pulsar+ssl://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Values.broker.ports.pulsarssl }}/"
8989
{{- end }}
9090
PF_kubernetesContainerFactory_changeConfigMap: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}-config"
91-
PF_kubernetesContainerFactory_changeConfigMapNamespace: {{ .Values.namespace }}
91+
PF_kubernetesContainerFactory_changeConfigMapNamespace: {{ template "pulsar.namespace" . }}
9292
{{- end }}
9393

9494
# prometheus needs to access /metrics endpoint

Diff for: charts/pulsar/templates/broker-pdb.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ apiVersion: policy/v1beta1
2323
kind: PodDisruptionBudget
2424
metadata:
2525
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}"
26-
namespace: {{ .Values.namespace }}
26+
namespace: {{ template "pulsar.namespace" . }}
2727
labels:
2828
{{- include "pulsar.standardLabels" . | nindent 4 }}
2929
component: {{ .Values.broker.component }}

Diff for: charts/pulsar/templates/broker-rbac.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ apiVersion: v1
4242
kind: ServiceAccount
4343
metadata:
4444
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
45-
namespace: {{ .Values.namespace }}
45+
namespace: {{ template "pulsar.namespace" . }}
4646
---
4747

4848
apiVersion: rbac.authorization.k8s.io/v1beta1
@@ -56,5 +56,5 @@ roleRef:
5656
subjects:
5757
- kind: ServiceAccount
5858
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
59-
namespace: {{ .Values.namespace }}
59+
namespace: {{ template "pulsar.namespace" . }}
6060
{{- end }}

Diff for: charts/pulsar/templates/broker-service-account.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: ServiceAccount
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}-acct"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.broker.component }}

Diff for: charts/pulsar/templates/broker-service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: Service
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.broker.component }}

Diff for: charts/pulsar/templates/broker-statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: apps/v1
2222
kind: StatefulSet
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.broker.component }}

Diff for: charts/pulsar/templates/dashboard-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: apps/v1
2222
kind: Deployment
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.dashboard.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.dashboard.component }}

Diff for: charts/pulsar/templates/dashboard-ingress.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ metadata:
3030
{{ toYaml . | indent 4 }}
3131
{{- end }}
3232
name: "{{ template "pulsar.fullname" . }}-{{ .Values.dashboard.component }}"
33-
namespace: {{ .Values.namespace }}
33+
namespace: {{ template "pulsar.namespace" . }}
3434
spec:
3535
{{- if .Values.dashboard.ingress.tls.enabled }}
3636
tls:

Diff for: charts/pulsar/templates/dashboard-service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: Service
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.dashboard.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.dashboard.component }}

Diff for: charts/pulsar/templates/function-worker-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ apiVersion: v1
2323
kind: ConfigMap
2424
metadata:
2525
name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}-config"
26-
namespace: {{ .Values.namespace }}
26+
namespace: {{ template "pulsar.namespace" . }}
2727
labels:
2828
{{- include "pulsar.standardLabels" . | nindent 4 }}
2929
component: {{ .Values.functions.component }}

Diff for: charts/pulsar/templates/grafana-admin-secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: Secret
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}-secret"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.grafana.component }}

Diff for: charts/pulsar/templates/grafana-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: ConfigMap
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.grafana.component }}

Diff for: charts/pulsar/templates/grafana-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: apps/v1
2222
kind: Deployment
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.grafana.component }}

Diff for: charts/pulsar/templates/grafana-ingress.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ apiVersion: extensions/v1beta1
2323
kind: Ingress
2424
metadata:
2525
name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
26-
namespace: {{ .Values.namespace }}
26+
namespace: {{ template "pulsar.namespace" . }}
2727
labels:
2828
app: {{ template "pulsar.name" . }}
2929
chart: {{ template "pulsar.chart" . }}

Diff for: charts/pulsar/templates/grafana-service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: Service
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.grafana.component }}

Diff for: charts/pulsar/templates/keytool.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ apiVersion: v1
2323
kind: ConfigMap
2424
metadata:
2525
name: "{{ template "pulsar.fullname" . }}-keytool-configmap"
26-
namespace: {{ .Values.namespace }}
26+
namespace: {{ template "pulsar.namespace" . }}
2727
labels:
2828
{{- include "pulsar.standardLabels" . | nindent 4 }}
2929
component: keytool

Diff for: charts/pulsar/templates/namespace.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
apiVersion: v1
2222
kind: Namespace
2323
metadata:
24-
name: {{ .Values.namespace }}
24+
name: {{ template "pulsar.namespace" . }}
2525
{{- end }}

Diff for: charts/pulsar/templates/prometheus-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apiVersion: v1
2222
kind: ConfigMap
2323
metadata:
2424
name: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}"
25-
namespace: {{ .Values.namespace }}
25+
namespace: {{ template "pulsar.namespace" . }}
2626
labels:
2727
{{- include "pulsar.standardLabels" . | nindent 4 }}
2828
component: {{ .Values.prometheus.component }}

0 commit comments

Comments
 (0)