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:
Yong Zhang 2020-04-16 23:59:26 +08:00 committed by GitHub
parent 9e540ab791
commit 977999f9a0
9 changed files with 27 additions and 27 deletions

View File

@ -47,7 +47,7 @@ Define autorecovery tls certs volumes
{{- if and .Values.tls.enabled .Values.tls.zookeeper.enabled }} {{- if and .Values.tls.enabled .Values.tls.zookeeper.enabled }}
- name: autorecovery-certs - name: autorecovery-certs
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.autorecovery.cert_name }}" secretName: "{{ .Release.Name }}-{{ .Values.tls.autorecovery.cert_name }}"
items: items:
- key: tls.crt - key: tls.crt
path: tls.crt path: tls.crt
@ -55,7 +55,7 @@ Define autorecovery tls certs volumes
path: tls.key path: tls.key
- name: ca - name: ca
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-ca-tls" secretName: "{{ .Release.Name }}-ca-tls"
items: items:
- key: ca.crt - key: ca.crt
path: ca.crt path: ca.crt

View File

@ -48,7 +48,7 @@ Define bookie tls certs volumes
{{- if and .Values.tls.enabled (or .Values.tls.bookie.enabled .Values.tls.zookeeper.enabled) }} {{- if and .Values.tls.enabled (or .Values.tls.bookie.enabled .Values.tls.zookeeper.enabled) }}
- name: bookie-certs - name: bookie-certs
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.bookie.cert_name }}" secretName: "{{ .Release.Name }}-{{ .Values.tls.bookie.cert_name }}"
items: items:
- key: tls.crt - key: tls.crt
path: tls.crt path: tls.crt
@ -56,7 +56,7 @@ Define bookie tls certs volumes
path: tls.key path: tls.key
- name: ca - name: ca
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-ca-tls" secretName: "{{ .Release.Name }}-ca-tls"
items: items:
- key: ca.crt - key: ca.crt
path: ca.crt path: ca.crt

View File

@ -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)) }} {{- if and .Values.tls.enabled (or .Values.tls.broker.enabled (or .Values.tls.bookie.enabled .Values.tls.zookeeper.enabled)) }}
- name: broker-certs - name: broker-certs
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.broker.cert_name }}" secretName: "{{ .Release.Name }}-{{ .Values.tls.broker.cert_name }}"
items: items:
- key: tls.crt - key: tls.crt
path: tls.crt path: tls.crt
@ -62,7 +62,7 @@ Define broker tls certs volumes
path: tls.key path: tls.key
- name: ca - name: ca
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-ca-tls" secretName: "{{ .Release.Name }}-ca-tls"
items: items:
- key: ca.crt - key: ca.crt
path: ca.crt path: ca.crt

View File

@ -47,7 +47,7 @@ Define toolset tls certs volumes
{{- if and .Values.tls.enabled .Values.tls.zookeeper.enabled }} {{- if and .Values.tls.enabled .Values.tls.zookeeper.enabled }}
- name: toolset-certs - name: toolset-certs
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.toolset.cert_name }}" secretName: "{{ .Release.Name }}-{{ .Values.tls.toolset.cert_name }}"
items: items:
- key: tls.crt - key: tls.crt
path: tls.crt path: tls.crt
@ -55,7 +55,7 @@ Define toolset tls certs volumes
path: tls.key path: tls.key
- name: ca - name: ca
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-ca-tls" secretName: "{{ .Release.Name }}-ca-tls"
items: items:
- key: ca.crt - key: ca.crt
path: ca.crt path: ca.crt

View File

@ -217,13 +217,13 @@ spec:
{{- if .Values.tls.proxy.enabled }} {{- if .Values.tls.proxy.enabled }}
- name: ca - name: ca
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-ca-tls" secretName: "{{ .Release.Name }}-ca-tls"
items: items:
- key: ca.crt - key: ca.crt
path: ca.crt path: ca.crt
- name: proxy-certs - name: proxy-certs
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.proxy.cert_name }}" secretName: "{{ .Release.Name }}-{{ .Values.tls.proxy.cert_name }}"
items: items:
- key: tls.crt - key: tls.crt
path: tls.crt path: tls.crt

View File

@ -34,7 +34,7 @@ metadata:
name: "{{ template "pulsar.fullname" . }}-ca" name: "{{ template "pulsar.fullname" . }}-ca"
namespace: {{ .Values.namespace }} namespace: {{ .Values.namespace }}
spec: spec:
secretName: "{{ template "pulsar.fullname" . }}-ca-tls" secretName: "{{ .Release.Name }}-ca-tls"
commonName: "{{ .Values.namespace }}.svc.cluster.local" commonName: "{{ .Values.namespace }}.svc.cluster.local"
usages: usages:
- server auth - server auth
@ -57,6 +57,6 @@ metadata:
namespace: {{ .Values.namespace }} namespace: {{ .Values.namespace }}
spec: spec:
ca: ca:
secretName: "{{ template "pulsar.fullname" . }}-ca-tls" secretName: "{{ .Release.Name }}-ca-tls"
{{- end }} {{- end }}
{{- end }} {{- end }}

View File

@ -28,7 +28,7 @@ metadata:
namespace: {{ .Values.namespace }} namespace: {{ .Values.namespace }}
spec: spec:
# Secret names are always required. # 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 }}" duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}" renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization: organization:
@ -67,7 +67,7 @@ metadata:
namespace: {{ .Values.namespace }} namespace: {{ .Values.namespace }}
spec: spec:
# Secret names are always required. # 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 }}" duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}" renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization: organization:
@ -106,7 +106,7 @@ metadata:
namespace: {{ .Values.namespace }} namespace: {{ .Values.namespace }}
spec: spec:
# Secret names are always required. # 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 }}" duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}" renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization: organization:
@ -144,7 +144,7 @@ metadata:
namespace: {{ .Values.namespace }} namespace: {{ .Values.namespace }}
spec: spec:
# Secret names are always required. # 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 }}" duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}" renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization: organization:
@ -179,7 +179,7 @@ metadata:
namespace: {{ .Values.namespace }} namespace: {{ .Values.namespace }}
spec: spec:
# Secret names are always required. # 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 }}" duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}" renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization: organization:
@ -214,7 +214,7 @@ metadata:
namespace: {{ .Values.namespace }} namespace: {{ .Values.namespace }}
spec: spec:
# Secret names are always required. # 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 }}" duration: "{{ .Values.tls.common.duration }}"
renewBefore: "{{ .Values.tls.common.renewBefore }}" renewBefore: "{{ .Values.tls.common.renewBefore }}"
organization: organization:

View File

@ -99,7 +99,7 @@ spec:
{{- if and .Values.tls.enabled (or .Values.tls.broker.enabled .Values.tls.proxy.enabled) }} {{- if and .Values.tls.enabled (or .Values.tls.broker.enabled .Values.tls.proxy.enabled) }}
- name: proxy-ca - name: proxy-ca
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-ca-tls" secretName: "{{ .Release.Name }}-ca-tls"
items: items:
- key: ca.crt - key: ca.crt
path: ca.crt path: ca.crt

View File

@ -158,7 +158,7 @@ spec:
{{- if and .Values.tls.enabled .Values.tls.zookeeper.enabled }} {{- if and .Values.tls.enabled .Values.tls.zookeeper.enabled }}
- name: zookeeper-certs - name: zookeeper-certs
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.tls.zookeeper.cert_name }}" secretName: "{{ .Release.Name }}-{{ .Values.tls.zookeeper.cert_name }}"
items: items:
- key: tls.crt - key: tls.crt
path: tls.crt path: tls.crt
@ -166,7 +166,7 @@ spec:
path: tls.key path: tls.key
- name: ca - name: ca
secret: secret:
secretName: "{{ template "pulsar.fullname" . }}-ca-tls" secretName: "{{ .Release.Name }}-ca-tls"
items: items:
- key: ca.crt - key: ca.crt
path: ca.crt path: ca.crt