Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-14 14:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/kibana] Don't regenerate self-signed certs on upgrade (#14632)

Browse Source 
Signed-off-by: Miguel Ruiz <miruiz@vmware.com>
This commit is contained in:
Miguel Ruiz
2023-02-01 08:56:51 +01:00
committed by GitHub
parent fb67c5e2a5
commit ce3f71221d
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/kibana/Chart.yaml
View File

@@ -25,4 +25,4 @@ name: kibana
sources: sources:
- https://github.com/bitnami/containers/tree/main/bitnami/kibana - https://github.com/bitnami/containers/tree/main/bitnami/kibana
- https://www.elastic.co/products/kibana - https://www.elastic.co/products/kibana
version: 10.2.13 version: 10.2.14

20
bitnami/kibana/templates/tls-secret.yaml
View File

@@ -22,12 +22,13 @@ data:
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if and .Values.ingress.tls .Values.ingress.selfSigned }} {{- if and .Values.ingress.tls .Values.ingress.selfSigned }}
{{- $secretName := printf "%s-tls" .Values.ingress.hostname }}
{{- $ca := genCA "kibana-ingress-ca" 365 }} {{- $ca := genCA "kibana-ingress-ca" 365 }}
{{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 365 $ca }} {{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 365 $ca }}
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ printf "%s-tls" .Values.ingress.hostname }} name: {{ $secretName }}
namespace: {{ include "common.names.namespace" . | quote }} namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: kibana app.kubernetes.io/component: kibana
@@ -39,23 +40,24 @@ metadata:
{{- end }} {{- end }}
type: kubernetes.io/tls type: kubernetes.io/tls
data: data:
tls.crt: {{ $cert.Cert | b64enc | quote }} tls.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.crt" "defaultValue" $cert.Cert "context" $) }}
tls.key: {{ $cert.Key | b64enc | quote }} tls.key: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.key" "defaultValue" $cert.Key "context" $) }}
ca.crt: {{ $ca.Cert | b64enc | quote }} ca.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "ca.crt" "defaultValue" $ca.Cert "context" $) }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if (include "kibana.createTlsSecret" .) }} {{- if (include "kibana.createTlsSecret" .) }}
{{- $secretName := printf "%s-crt" (include "common.names.fullname" .) }}
{{- $ca := genCA "kibana-ca" 365 }} {{- $ca := genCA "kibana-ca" 365 }}
{{- $releaseNamespace := include "common.names.namespace" . }} {{- $releaseNamespace := include "common.names.namespace" . }}
{{- $clusterDomain := .Values.clusterDomain }} {{- $clusterDomain := .Values.clusterDomain }}
{{- $serviceName := include "common.names.fullname" . }} {{- $serviceName := include "common.names.fullname" . }}
{{- $altNames := list (printf "*.%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain) $serviceName }} {{- $altNames := list (printf "*.%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain) $serviceName }}
{{- $crt := genSignedCert $serviceName nil $altNames 365 $ca }} {{- $cert := genSignedCert $serviceName nil $altNames 365 $ca }}
--- ---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ printf "%s-crt" (include "common.names.fullname" .) }} name: {{ $secretName }}
namespace: {{ include "common.names.namespace" . | quote }} namespace: {{ include "common.names.namespace" . | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
@@ -66,7 +68,7 @@ metadata:
{{- end }} {{- end }}
type: kubernetes.io/tls type: kubernetes.io/tls
data: data:
ca.crt: {{ $ca.Cert | b64enc | quote }} tls.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.crt" "defaultValue" $cert.Cert "context" $) }}
tls.crt: {{ $crt.Cert | b64enc | quote }} tls.key: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.key" "defaultValue" $cert.Key "context" $) }}
tls.key: {{ $crt.Key | b64enc | quote }} ca.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "ca.crt" "defaultValue" $ca.Cert "context" $) }}
{{- end }} {{- end }}