You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by zh...@apache.org on 2020/04/16 15:59:36 UTC
[pulsar] branch master updated: Make secret name consistent (#6739)
This is an automated email from the ASF dual-hosted git repository.
zhaijia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 35e5589 Make secret name consistent (#6739)
35e5589 is described below
commit 35e55892c42f462f3295f5a22af9bdbcae64a6ef
Author: Yong Zhang <zh...@gmail.com>
AuthorDate: Thu Apr 16 23:59:26 2020 +0800
Make secret name consistent (#6739)
* Make secret name consistent
---
*Motivation*
Make the secret name consistent. And all secret names should
use the release name as the prefix.
* Update ci script
* Fix the file path
* Fix path
* Fix env
Co-authored-by: Sijie Guo <si...@apache.org>
---
.ci/chart_test.sh | 2 -
.ci/clusters/values-bk-tls.yaml | 9 +-
.ci/clusters/values-broker-tls.yaml | 9 +-
.ci/clusters/values-function.yaml | 7 ++
.ci/clusters/values-jwt-asymmetric.yaml | 9 ++
.ci/clusters/values-jwt-symmetric.yaml | 9 ++
.ci/clusters/values-local-pv.yaml | 9 ++
.ci/clusters/values-pulsar-image.yaml | 11 +-
.ci/clusters/values-tls.yaml | 9 ++
.ci/clusters/values-zk-tls.yaml | 9 ++
.ci/clusters/values-zkbk-tls.yaml | 9 ++
.ci/helm.sh | 7 +-
.ci/release.sh | 112 +++++++++++++++++++++
.../helm/pulsar/templates/_autorecovery.tpl | 6 +-
.../helm/pulsar/templates/_bookkeeper.tpl | 6 +-
.../kubernetes/helm/pulsar/templates/_broker.tpl | 6 +-
.../kubernetes/helm/pulsar/templates/_toolset.tpl | 6 +-
.../helm/pulsar/templates/proxy-statefulset.yaml | 4 +-
.../pulsar/templates/tls-cert-internal-issuer.yaml | 6 +-
.../helm/pulsar/templates/tls-certs-internal.yaml | 14 +--
.../helm/pulsar/templates/toolset-statefulset.yaml | 2 +-
.../pulsar/templates/zookeeper-statefulset.yaml | 4 +-
22 files changed, 230 insertions(+), 35 deletions(-)
diff --git a/.ci/chart_test.sh b/.ci/chart_test.sh
index a34bc14..e9bdab4 100755
--- a/.ci/chart_test.sh
+++ b/.ci/chart_test.sh
@@ -29,8 +29,6 @@ FUNCTION=${FUNCTION:-"false"}
source ${PULSAR_HOME}/.ci/helm.sh
-CHARTS_HOME="${PULSAR_HOME}/deployment/kubernetes/helm"
-
# create cluster
ci::create_cluster
diff --git a/.ci/clusters/values-bk-tls.yaml b/.ci/clusters/values-bk-tls.yaml
index e31cf17..dc947b7 100644
--- a/.ci/clusters/values-bk-tls.yaml
+++ b/.ci/clusters/values-bk-tls.yaml
@@ -17,6 +17,12 @@
# under the License.
#
+monitoring:
+ prometheus: false
+ grafana: false
+ node_exporter: false
+ alert_manager: false
+
volumes:
local_storage: true
@@ -27,6 +33,7 @@ affinity:
# disable auto recovery
components:
autorecovery: false
+ pulsar_manager: fales
zookeeper:
replicaCount: 1
@@ -65,4 +72,4 @@ tls:
# disable cert manager
certs:
internal_issuer:
- enabled: false
\ No newline at end of file
+ enabled: false
diff --git a/.ci/clusters/values-broker-tls.yaml b/.ci/clusters/values-broker-tls.yaml
index cdd919d..f7ee3e6 100644
--- a/.ci/clusters/values-broker-tls.yaml
+++ b/.ci/clusters/values-broker-tls.yaml
@@ -17,6 +17,12 @@
# under the License.
#
+monitoring:
+ prometheus: false
+ grafana: false
+ node_exporter: false
+ alert_manager: false
+
volumes:
local_storage: true
@@ -27,6 +33,7 @@ affinity:
# disable auto recovery
components:
autorecovery: false
+ pulsar_manager: false
zookeeper:
replicaCount: 1
@@ -67,4 +74,4 @@ tls:
# disable cert-manager
certs:
internal_issuer:
- enabled: false
\ No newline at end of file
+ enabled: false
diff --git a/.ci/clusters/values-function.yaml b/.ci/clusters/values-function.yaml
index b3ae452..9b23953 100644
--- a/.ci/clusters/values-function.yaml
+++ b/.ci/clusters/values-function.yaml
@@ -17,6 +17,12 @@
# under the License.
#
+monitoring:
+ prometheus: false
+ grafana: false
+ node_exporter: false
+ alert_manager: false
+
volumes:
local_storage: true
@@ -27,6 +33,7 @@ affinity:
# disable auto recovery
components:
autorecovery: false
+ pulsar_manager: false
zookeeper:
replicaCount: 1
diff --git a/.ci/clusters/values-jwt-asymmetric.yaml b/.ci/clusters/values-jwt-asymmetric.yaml
index 817c11d..c7c03bc 100644
--- a/.ci/clusters/values-jwt-asymmetric.yaml
+++ b/.ci/clusters/values-jwt-asymmetric.yaml
@@ -17,6 +17,15 @@
# under the License.
#
+components:
+ pulsar_manager: false
+
+monitoring:
+ prometheus: false
+ grafana: false
+ node_exporter: false
+ alert_manager: false
+
volumes:
local_storage: true
diff --git a/.ci/clusters/values-jwt-symmetric.yaml b/.ci/clusters/values-jwt-symmetric.yaml
index e01b11a..39f6c59 100644
--- a/.ci/clusters/values-jwt-symmetric.yaml
+++ b/.ci/clusters/values-jwt-symmetric.yaml
@@ -17,6 +17,15 @@
# under the License.
#
+components:
+ pulsar_manager: false
+
+monitoring:
+ prometheus: false
+ grafana: false
+ node_exporter: false
+ alert_manager: false
+
volumes:
local_storage: true
diff --git a/.ci/clusters/values-local-pv.yaml b/.ci/clusters/values-local-pv.yaml
index 7097073..a90cc3c 100644
--- a/.ci/clusters/values-local-pv.yaml
+++ b/.ci/clusters/values-local-pv.yaml
@@ -17,6 +17,15 @@
# under the License.
#
+components:
+ pulsar_manager: false
+
+monitoring:
+ prometheus: false
+ grafana: false
+ node_exporter: false
+ alert_manager: false
+
volumes:
local_storage: true
diff --git a/.ci/clusters/values-pulsar-image.yaml b/.ci/clusters/values-pulsar-image.yaml
index 21ac336..7312f12 100644
--- a/.ci/clusters/values-pulsar-image.yaml
+++ b/.ci/clusters/values-pulsar-image.yaml
@@ -17,8 +17,17 @@
# under the License.
#
+components:
+ pulsar_manager: false
+
+monitoring:
+ prometheus: false
+ grafana: false
+ node_exporter: false
+ alert_manager: false
+
volumes:
- local_storage: true
+ persistence: false
# disabled AntiAffinity
affinity:
diff --git a/.ci/clusters/values-tls.yaml b/.ci/clusters/values-tls.yaml
index 4d74970..03e4881 100644
--- a/.ci/clusters/values-tls.yaml
+++ b/.ci/clusters/values-tls.yaml
@@ -17,6 +17,15 @@
# under the License.
#
+components:
+ pulsar_manager: false
+
+monitoring:
+ prometheus: false
+ grafana: false
+ node_exporter: false
+ alert_manager: false
+
volumes:
local_storage: true
diff --git a/.ci/clusters/values-zk-tls.yaml b/.ci/clusters/values-zk-tls.yaml
index ffd8bcf..bb1c5eb 100644
--- a/.ci/clusters/values-zk-tls.yaml
+++ b/.ci/clusters/values-zk-tls.yaml
@@ -17,6 +17,15 @@
# under the License.
#
+components:
+ pulsar_manager: false
+
+monitoring:
+ prometheus: false
+ grafana: false
+ node_exporter: false
+ alert_manager: false
+
volumes:
local_storage: true
diff --git a/.ci/clusters/values-zkbk-tls.yaml b/.ci/clusters/values-zkbk-tls.yaml
index 874389b..686d607 100644
--- a/.ci/clusters/values-zkbk-tls.yaml
+++ b/.ci/clusters/values-zkbk-tls.yaml
@@ -17,6 +17,15 @@
# under the License.
#
+components:
+ pulsar_manager: false
+
+monitoring:
+ prometheus: false
+ grafana: false
+ node_exporter: false
+ alert_manager: false
+
volumes:
local_storage: true
diff --git a/.ci/helm.sh b/.ci/helm.sh
index 5ef6696..5aa7c44 100644
--- a/.ci/helm.sh
+++ b/.ci/helm.sh
@@ -19,11 +19,12 @@
#
BINDIR=`dirname "$0"`
-CHARTS_HOME=`cd ${BINDIR}/../deployment/kubernetes/helm/;pwd`
+PULSAR_HOME=`cd ${BINDIR}/..;pwd`
+CHARTS_HOME=${PULSAR_HOME}/deployment/kubernetes/helm
OUTPUT_BIN=${CHARTS_HOME}/output/bin
+KIND_BIN=$OUTPUT_BIN/kind
HELM=${OUTPUT_BIN}/helm
KUBECTL=${OUTPUT_BIN}/kubectl
-KIND_BIN=$OUTPUT_BIN/kind
NAMESPACE=pulsar
CLUSTER=pulsar-ci
CLUSTER_ID=$(uuidgen)
@@ -77,7 +78,7 @@ function ci::install_pulsar_chart() {
${KUBECTL} create namespace ${NAMESPACE}
echo ${CHARTS_HOME}/scripts/pulsar/prepare_helm_release.sh -k ${CLUSTER} -n ${NAMESPACE} ${extra_opts}
${CHARTS_HOME}/scripts/pulsar/prepare_helm_release.sh -k ${CLUSTER} -n ${NAMESPACE} ${extra_opts}
- ${CHARTS_HOME}/scripts/pulsar/upload_tls.sh -k ${CLUSTER} -d ${CHARTS_HOME}/../../../.ci/tls
+ ${CHARTS_HOME}/scripts/pulsar/upload_tls.sh -k ${CLUSTER} -d ${PULSAR_HOME}/.ci/tls
sleep 10
echo ${HELM} install --values ${value_file} ${CLUSTER} ${CHARTS_HOME}/pulsar
diff --git a/.ci/release.sh b/.ci/release.sh
new file mode 100755
index 0000000..2651787
--- /dev/null
+++ b/.ci/release.sh
@@ -0,0 +1,112 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+
+BINDIR=`dirname "$0"`
+CHARTS_HOME=`cd ${BINDIR}/..;pwd`
+CHARTS_PKGS=${CHARTS_HOME}/.chart-packages
+CHARTS_INDEX=${CHARTS_HOME}/.chart-index
+CHARTS_REPO=${CHARTS_REPO:-"https://charts.streamnative.io"}
+OWNER=${OWNER:-streamnative}
+REPO=${REPO:-charts}
+GITHUB_TOKEN=${GITHUB_TOKEN:-"UNSET"}
+PUBLISH_CHARTS=${PUBLISH_CHARTS:-"false"}
+GITUSER=${GITUSER:-"UNSET"}
+GITEMAIL=${GITEMAIL:-"UNSET"}
+
+# hack/common.sh need this variable to be set
+PULSAR_CHART_HOME=${CHARTS_HOME}
+
+source ${CHARTS_HOME}/hack/common.sh
+source ${CHARTS_HOME}/.ci/git.sh
+
+# allow overwriting cr binary
+CR="docker run -v ${CHARTS_HOME}:/cr quay.io/helmpack/chart-releaser:v${CR_VERSION} cr"
+
+function release::ensure_dir() {
+ local dir=$1
+ if [[ -d ${dir} ]]; then
+ rm -rf ${dir}
+ fi
+ mkdir -p ${dir}
+}
+
+function release::find_changed_charts() {
+ local charts_dir=$1
+ echo $(git diff --find-renames --name-only "$latest_tag_rev" -- ${charts_dir} | cut -d '/' -f 2 | uniq)
+}
+
+function release::package_chart() {
+ local chart=$1
+ echo "Packaging chart '$chart'..."
+ helm package ${CHARTS_HOME}/charts/$chart --destination ${CHARTS_PKGS}
+}
+
+function release::upload_packages() {
+ ${CR} upload --owner ${OWNER} --git-repo ${REPO} -t ${GITHUB_TOKEN} --package-path /cr/.chart-packages
+}
+
+function release::update_chart_index() {
+ ${CR} index -o ${OWNER} -r ${REPO} -t "${GITHUB_TOKEN}" -c ${CHARTS_REPO} --index-path /cr/.chart-index --package-path /cr/.chart-packages
+}
+
+function release::publish_charts() {
+ git config user.email "${GITEMAIL}"
+ git config user.name "${GITUSER}"
+
+ git checkout gh-pages
+ cp --force ${CHARTS_INDEX}/index.yaml index.yaml
+ git add index.yaml
+ git commit --message="Publish new charts to ${CHARTS_REPO}" --signoff
+ git remote -v
+ git remote add sn https://${SNBOT_USER}:${GITHUB_TOKEN}@github.com/${OWNER}/${REPO}
+ git push sn gh-pages
+}
+
+# install cr
+# hack::ensure_cr
+docker pull quay.io/helmpack/chart-releaser:v${CR_VERSION}
+
+latest_tag=$(git::find_latest_tag)
+echo "Latest tag: $latest_tag"
+
+latest_tag_rev=$(git::get_revision "$latest_tag")
+echo "$latest_tag_rev $latest_tag (latest tag)"
+
+head_rev=$(git::get_revision HEAD)
+echo "$head_rev HEAD"
+
+if [[ "$latest_tag_rev" == "$head_rev" ]]; then
+ echo "Do nothing. Exiting ..."
+ exit
+fi
+
+release::ensure_dir ${CHARTS_PKGS}
+release::ensure_dir ${CHARTS_INDEX}
+
+for chart in $(release::find_changed_charts charts); do
+ release::package_chart ${chart}
+done
+
+release::upload_packages
+release::update_chart_index
+
+if [[ "x${PUBLISH_CHARTS}" == "xtrue" ]]; then
+ release::publish_charts
+fi
diff --git a/deployment/kubernetes/helm/pulsar/templates/_autorecovery.tpl b/deployment/kubernetes/helm/pulsar/templates/_autorecovery.tpl
index 3fb3f4b..1930c89 100644
--- a/deployment/kubernetes/helm/pulsar/templates/_autorecovery.tpl
+++ b/deployment/kubernetes/helm/pulsar/templates/_autorecovery.tpl
@@ -47,7 +47,7 @@ Define autorecovery tls certs volumes
{{- if and .Values.tls.enabled .Values.tls.zookeeper.enabled }}
- name: autorecovery-certs
secret:
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.autorecovery.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.autorecovery.cert_name }}"
items:
- key: tls.crt
path: tls.crt
@@ -55,7 +55,7 @@ Define autorecovery tls certs volumes
path: tls.key
- name: ca
secret:
- secretName: "{{ template "pulsar.fullname" . }}-ca-tls"
+ secretName: "{{ .Release.Name }}-ca-tls"
items:
- key: ca.crt
path: ca.crt
@@ -77,4 +77,4 @@ bin/apply-config-from-env.py conf/bookkeeper.conf;
until bin/bookkeeper shell whatisinstanceid; do
sleep 3;
done;
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/_bookkeeper.tpl b/deployment/kubernetes/helm/pulsar/templates/_bookkeeper.tpl
index d828009..fa4dd9f 100644
--- a/deployment/kubernetes/helm/pulsar/templates/_bookkeeper.tpl
+++ b/deployment/kubernetes/helm/pulsar/templates/_bookkeeper.tpl
@@ -48,7 +48,7 @@ Define bookie tls certs volumes
{{- if and .Values.tls.enabled (or .Values.tls.bookie.enabled .Values.tls.zookeeper.enabled) }}
- name: bookie-certs
secret:
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.bookie.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.bookie.cert_name }}"
items:
- key: tls.crt
path: tls.crt
@@ -56,7 +56,7 @@ Define bookie tls certs volumes
path: tls.key
- name: ca
secret:
- secretName: "{{ template "pulsar.fullname" . }}-ca-tls"
+ secretName: "{{ .Release.Name }}-ca-tls"
items:
- key: ca.crt
path: ca.crt
@@ -118,4 +118,4 @@ until bin/bookkeeper shell whatisinstanceid; do
sleep 3;
done;
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/_broker.tpl b/deployment/kubernetes/helm/pulsar/templates/_broker.tpl
index cff94f9..bdc808f 100644
--- a/deployment/kubernetes/helm/pulsar/templates/_broker.tpl
+++ b/deployment/kubernetes/helm/pulsar/templates/_broker.tpl
@@ -54,7 +54,7 @@ Define broker tls certs volumes
{{- if and .Values.tls.enabled (or .Values.tls.broker.enabled (or .Values.tls.bookie.enabled .Values.tls.zookeeper.enabled)) }}
- name: broker-certs
secret:
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.broker.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.broker.cert_name }}"
items:
- key: tls.crt
path: tls.crt
@@ -62,7 +62,7 @@ Define broker tls certs volumes
path: tls.key
- name: ca
secret:
- secretName: "{{ template "pulsar.fullname" . }}-ca-tls"
+ secretName: "{{ .Release.Name }}-ca-tls"
items:
- key: ca.crt
path: ca.crt
@@ -73,4 +73,4 @@ Define broker tls certs volumes
defaultMode: 0755
{{- end }}
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/_toolset.tpl b/deployment/kubernetes/helm/pulsar/templates/_toolset.tpl
index 405fa71..82217c9 100644
--- a/deployment/kubernetes/helm/pulsar/templates/_toolset.tpl
+++ b/deployment/kubernetes/helm/pulsar/templates/_toolset.tpl
@@ -47,7 +47,7 @@ Define toolset tls certs volumes
{{- if and .Values.tls.enabled .Values.tls.zookeeper.enabled }}
- name: toolset-certs
secret:
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.toolset.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.toolset.cert_name }}"
items:
- key: tls.crt
path: tls.crt
@@ -55,7 +55,7 @@ Define toolset tls certs volumes
path: tls.key
- name: ca
secret:
- secretName: "{{ template "pulsar.fullname" . }}-ca-tls"
+ secretName: "{{ .Release.Name }}-ca-tls"
items:
- key: ca.crt
path: ca.crt
@@ -66,4 +66,4 @@ Define toolset tls certs volumes
defaultMode: 0755
{{- end }}
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/proxy-statefulset.yaml b/deployment/kubernetes/helm/pulsar/templates/proxy-statefulset.yaml
index c83c2e3..d974c0f 100644
--- a/deployment/kubernetes/helm/pulsar/templates/proxy-statefulset.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/proxy-statefulset.yaml
@@ -217,13 +217,13 @@ spec:
{{- if .Values.tls.proxy.enabled }}
- name: ca
secret:
- secretName: "{{ template "pulsar.fullname" . }}-ca-tls"
+ secretName: "{{ .Release.Name }}-ca-tls"
items:
- key: ca.crt
path: ca.crt
- name: proxy-certs
secret:
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.proxy.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.proxy.cert_name }}"
items:
- key: tls.crt
path: tls.crt
diff --git a/deployment/kubernetes/helm/pulsar/templates/tls-cert-internal-issuer.yaml b/deployment/kubernetes/helm/pulsar/templates/tls-cert-internal-issuer.yaml
index 5d924f4d..bf006a1 100644
--- a/deployment/kubernetes/helm/pulsar/templates/tls-cert-internal-issuer.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/tls-cert-internal-issuer.yaml
@@ -34,7 +34,7 @@ metadata:
name: "{{ template "pulsar.fullname" . }}-ca"
namespace: {{ .Values.namespace }}
spec:
- secretName: "{{ template "pulsar.fullname" . }}-ca-tls"
+ secretName: "{{ .Release.Name }}-ca-tls"
commonName: "{{ .Values.namespace }}.svc.cluster.local"
usages:
- server auth
@@ -57,6 +57,6 @@ metadata:
namespace: {{ .Values.namespace }}
spec:
ca:
- secretName: "{{ template "pulsar.fullname" . }}-ca-tls"
+ secretName: "{{ .Release.Name }}-ca-tls"
+{{- end }}
{{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/deployment/kubernetes/helm/pulsar/templates/tls-certs-internal.yaml b/deployment/kubernetes/helm/pulsar/templates/tls-certs-internal.yaml
index 5b249c0..1a20bbd 100644
--- a/deployment/kubernetes/helm/pulsar/templates/tls-certs-internal.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/tls-certs-internal.yaml
@@ -28,7 +28,7 @@ metadata:
namespace: {{ .Values.namespace }}
spec:
# Secret names are always required.
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.proxy.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.proxy.cert_name }}"
duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization:
@@ -67,7 +67,7 @@ metadata:
namespace: {{ .Values.namespace }}
spec:
# Secret names are always required.
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.broker.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.broker.cert_name }}"
duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization:
@@ -106,7 +106,7 @@ metadata:
namespace: {{ .Values.namespace }}
spec:
# Secret names are always required.
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.bookie.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.bookie.cert_name }}"
duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization:
@@ -144,7 +144,7 @@ metadata:
namespace: {{ .Values.namespace }}
spec:
# Secret names are always required.
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.autorecovery.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.autorecovery.cert_name }}"
duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization:
@@ -179,7 +179,7 @@ metadata:
namespace: {{ .Values.namespace }}
spec:
# Secret names are always required.
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.toolset.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.toolset.cert_name }}"
duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization:
@@ -214,7 +214,7 @@ metadata:
namespace: {{ .Values.namespace }}
spec:
# Secret names are always required.
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.zookeeper.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.zookeeper.cert_name }}"
duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization:
@@ -244,4 +244,4 @@ spec:
{{- end }}
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/toolset-statefulset.yaml b/deployment/kubernetes/helm/pulsar/templates/toolset-statefulset.yaml
index b15ad8d..715680c 100644
--- a/deployment/kubernetes/helm/pulsar/templates/toolset-statefulset.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/toolset-statefulset.yaml
@@ -99,7 +99,7 @@ spec:
{{- if and .Values.tls.enabled (or .Values.tls.broker.enabled .Values.tls.proxy.enabled) }}
- name: proxy-ca
secret:
- secretName: "{{ template "pulsar.fullname" . }}-ca-tls"
+ secretName: "{{ .Release.Name }}-ca-tls"
items:
- key: ca.crt
path: ca.crt
diff --git a/deployment/kubernetes/helm/pulsar/templates/zookeeper-statefulset.yaml b/deployment/kubernetes/helm/pulsar/templates/zookeeper-statefulset.yaml
index 21a4553..dc78cfd 100644
--- a/deployment/kubernetes/helm/pulsar/templates/zookeeper-statefulset.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/zookeeper-statefulset.yaml
@@ -158,7 +158,7 @@ spec:
{{- if and .Values.tls.enabled .Values.tls.zookeeper.enabled }}
- name: zookeeper-certs
secret:
- secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.zookeeper.cert_name }}"
+ secretName: "{{ .Release.Name }}-{{ .Values.tls.zookeeper.cert_name }}"
items:
- key: tls.crt
path: tls.crt
@@ -166,7 +166,7 @@ spec:
path: tls.key
- name: ca
secret:
- secretName: "{{ template "pulsar.fullname" . }}-ca-tls"
+ secretName: "{{ .Release.Name }}-ca-tls"
items:
- key: ca.crt
path: ca.crt