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 <sijie@apache.org>
This commit is contained in:
parent
9e540ab791
commit
977999f9a0
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 }}
|
||||
@ -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:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user