Skip to content

Commit e1721a4

Browse files
jianxiaoguojianxiaoguo
committed
chore(addons): modity self-signed certificates valid
1 parent d8a6f8d commit e1721a4

19 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎addons/airflow/2/chart/airflow/templates/web/tls-secrets.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ data:
2424
{{- end }}
2525
{{- if and .Values.ingress.tls .Values.ingress.selfSigned }}
2626
{{- $secretName := printf "%s-tls" .Values.ingress.hostname }}
27-
{{- $ca := genCA "airflow-ca" 365 }}
28-
{{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 365 $ca }}
27+
{{- $ca := genCA "airflow-ca" 36500 }}
28+
{{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 36500 $ca }}
2929
apiVersion: v1
3030
kind: Secret
3131
metadata:

‎addons/airflow/2/chart/airflow/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1293,7 +1293,7 @@ ingress:
12931293
## NOTE: 'key' and 'certificate' are expected in PEM format
12941294
## NOTE: 'name' should line up with a 'secretName' set further up
12951295
## If it is not set and you're using cert-manager, this is unneeded, as it will create a secret for you with valid certificates
1296-
## If it is not set and you're NOT using cert-manager either, self-signed certificates will be created valid for 365 days
1296+
## If it is not set and you're NOT using cert-manager either, self-signed certificates will be created valid for 36500 days
12971297
## It is also possible to create and manage the certificates outside of this helm chart
12981298
## Please see README.md for more information
12991299
## e.g:

‎addons/cloudbeaver/23/chart/cloudbeaver/templates/tls-secrets.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ data:
2121
{{- end }}
2222
{{- end }}
2323
{{- if and .Values.ingress.tls .Values.ingress.selfSigned }}
24-
{{- $ca := genCA "node-ca" 365 }}
25-
{{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 365 $ca }}
24+
{{- $ca := genCA "node-ca" 36500 }}
25+
{{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 36500 $ca }}
2626
apiVersion: v1
2727
kind: Secret
2828
metadata:

‎addons/grafana/10/chart/grafana/templates/tls-secret.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ data:
2222
{{- end }}
2323
{{- end }}
2424
{{- if and .Values.ingress.tls .Values.ingress.selfSigned }}
25-
{{- $ca := genCA "grafana-ca" 365 }}
26-
{{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 365 $ca }}
25+
{{- $ca := genCA "grafana-ca" 36500 }}
26+
{{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 36500 $ca }}
2727
apiVersion: v1
2828
kind: Secret
2929
metadata:

‎addons/kafka/3.6/chart/kafka/templates/tls-secret.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ SPDX-License-Identifier: APACHE-2.0
2323
{{- $altNames = append $altNames (printf "%s.%s" $replicaHost $releaseNamespace) }}
2424
{{- $altNames = append $altNames $replicaHost }}
2525
{{- end }}
26-
{{- $ca := genCA "kafka-ca" 365 }}
27-
{{- $cert := genSignedCert $fullname nil $altNames 365 $ca }}
26+
{{- $ca := genCA "kafka-ca" 36500 }}
27+
{{- $cert := genSignedCert $fullname nil $altNames 36500 $ca }}
2828
apiVersion: v1
2929
kind: Secret
3030
metadata:

‎addons/minio/2023/chart/minio/templates/tls-secrets.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ data:
2121
{{- end }}
2222
{{- end }}
2323
{{- if and .Values.ingress.tls .Values.ingress.selfSigned }}
24-
{{- $ca := genCA "minio-ca" 365 }}
25-
{{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 365 $ca }}
24+
{{- $ca := genCA "minio-ca" 36500 }}
25+
{{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 36500 $ca }}
2626
apiVersion: v1
2727
kind: Secret
2828
metadata:
@@ -43,14 +43,14 @@ data:
4343
{{- end }}
4444
{{- end }}
4545
{{- if (include "minio.createTlsSecret" .) }}
46-
{{- $ca := genCA "minio-ca" 365 }}
46+
{{- $ca := genCA "minio-ca" 36500 }}
4747
{{- $releaseNamespace := .Release.Namespace }}
4848
{{- $clusterDomain := .Values.clusterDomain }}
4949
{{- $fullname := include "common.names.fullname" . }}
5050
{{- $serviceName := include "common.names.fullname" . }}
5151
{{- $headlessServiceName := printf "%s-headless" (include "common.names.fullname" .) }}
5252
{{- $altNames := list (printf "*.%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain) (printf "*.%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) (printf "%s.%s.svc.%s" $headlessServiceName $releaseNamespace $clusterDomain) "127.0.0.1" "localhost" $fullname }}
53-
{{- $crt := genSignedCert $fullname nil $altNames 365 $ca }}
53+
{{- $crt := genSignedCert $fullname nil $altNames 36500 $ca }}
5454
---
5555
apiVersion: v1
5656
kind: Secret

‎addons/minio/2023/chart/minio/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ ingress:
698698
## name should line up with a secretName set further up
699699
##
700700
## If it is not set and you're using cert-manager, this is unneeded, as it will create a secret for you with valid certificates
701-
## If it is not set and you're NOT using cert-manager either, self-signed certificates will be created valid for 365 days
701+
## If it is not set and you're NOT using cert-manager either, self-signed certificates will be created valid for 36500 days
702702
## It is also possible to create and manage the certificates outside of this helm chart
703703
## Please see README.md for more information
704704
##
@@ -807,7 +807,7 @@ apiIngress:
807807
## name should line up with a secretName set further up
808808
##
809809
## If it is not set and you're using cert-manager, this is unneeded, as it will create a secret for you with valid certificates
810-
## If it is not set and you're NOT using cert-manager either, self-signed certificates will be created valid for 365 days
810+
## If it is not set and you're NOT using cert-manager either, self-signed certificates will be created valid for 36500 days
811811
## It is also possible to create and manage the certificates outside of this helm chart
812812
## Please see README.md for more information
813813
##

‎addons/mongodb/7.0/chart/mongodb/templates/common-scripts-cm.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ data:
9393
#Create the client/server cert
9494
openssl req -new -key /certs/mongo.key -out /certs/mongo.csr -subj "/C=US/O=My Organisations/OU=IT/CN=$my_hostname" -config /certs/openssl.cnf
9595
#Signing the server cert with the CA cert and key
96-
openssl x509 -req -in /certs/mongo.csr -CA /certs/mongodb-ca-cert -CAkey /certs/mongodb-ca-key -CAcreateserial -out /certs/mongo.crt -days 3650 -extensions v3_req -extfile /certs/openssl.cnf
96+
openssl x509 -req -in /certs/mongo.csr -CA /certs/mongodb-ca-cert -CAkey /certs/mongodb-ca-key -CAcreateserial -out /certs/mongo.crt -days 36500 -extensions v3_req -extfile /certs/openssl.cnf
9797
rm /certs/mongo.csr
9898
#Concatenate to a pem file for use as the client PEM file which can be used for both member and client authentication.
9999
cat /certs/mongo.crt /certs/mongo.key > /certs/mongodb.pem

‎addons/mongodb/7.0/chart/mongodb/templates/secrets-ca.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ type: Opaque
2121
data:
2222
{{- if or .Values.tls.caCert .Values.tls.caKey (not .Values.tls.autoGenerated) }}
2323
{{- $ca := buildCustomCert (required "A valid .Values.tls.caCert is required!" .Values.tls.caCert) (required "A valid .Values.tls.caKey is required!" .Values.tls.caKey) }}
24-
{{- $cert := genSignedCert $cn nil nil 3650 $ca }}
24+
{{- $cert := genSignedCert $cn nil nil 36500 $ca }}
2525
{{- $pem := printf "%s%s" $cert.Cert $cert.Key }}
2626
mongodb-ca-cert: {{ b64enc $ca.Cert }}
2727
mongodb-ca-key: {{ b64enc $ca.Key }}
2828
client-pem: {{ b64enc $pem }}
2929
{{- else }}
30-
{{- $ca:= genCA "myMongo-ca" 3650 }}
31-
{{- $cert := genSignedCert $cn nil nil 3650 $ca }}
30+
{{- $ca:= genCA "myMongo-ca" 36500 }}
31+
{{- $cert := genSignedCert $cn nil nil 36500 $ca }}
3232
{{- $pem := printf "%s%s" $cert.Cert $cert.Key }}
3333
mongodb-ca-cert: {{ b64enc $ca.Cert }}
3434
mongodb-ca-key: {{ b64enc $ca.Key }}

‎addons/prometheus/2/chart/prometheus/templates/tls-secret.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ data:
7070
{{- if (or (and .Values.server.ingress.tls .Values.server.ingress.selfSigned)
7171
(and .Values.alertmanager.ingress.tls .Values.alertmanager.ingress.selfSigned)
7272
(and .Values.server.thanos.ingress.tls .Values.server.thanos.ingress.selfSigned)) }}
73-
{{- $ca := genCA "prometheus-ca" 365 }}
73+
{{- $ca := genCA "prometheus-ca" 36500 }}
7474
{{- if and .Values.server.ingress.tls .Values.server.ingress.selfSigned }}
7575
{{- $secretName := printf "%s-tls" .Values.server.ingress.hostname }}
76-
{{- $cert := genSignedCert .Values.server.ingress.hostname nil (list .Values.server.ingress.hostname) 365 $ca }}
76+
{{- $cert := genSignedCert .Values.server.ingress.hostname nil (list .Values.server.ingress.hostname) 36500 $ca }}
7777
apiVersion: v1
7878
kind: Secret
7979
metadata:
@@ -94,7 +94,7 @@ data:
9494
{{- end }}
9595
{{- if and .Values.alertmanager.ingress.tls .Values.alertmanager.ingress.selfSigned }}
9696
{{- $secretName := printf "%s-tls" .Values.alertmanager.ingress.hostname }}
97-
{{- $cert := genSignedCert .Values.alertmanager.ingress.hostname nil (list .Values.alertmanager.ingress.hostname) 365 $ca }}
97+
{{- $cert := genSignedCert .Values.alertmanager.ingress.hostname nil (list .Values.alertmanager.ingress.hostname) 36500 $ca }}
9898
apiVersion: v1
9999
kind: Secret
100100
metadata:
@@ -115,7 +115,7 @@ data:
115115
---
116116
{{- if and .Values.server.thanos.ingress.tls .Values.server.thanos.ingress.selfSigned }}
117117
{{- $secretName := printf "%s-tls" .Values.server.thanos.ingress.hostname }}
118-
{{- $cert := genSignedCert .Values.server.thanos.ingress.hostname nil (list .Values.server.thanos.ingress.hostname) 365 $ca }}
118+
{{- $cert := genSignedCert .Values.server.thanos.ingress.hostname nil (list .Values.server.thanos.ingress.hostname) 36500 $ca }}
119119
apiVersion: v1
120120
kind: Secret
121121
metadata:

0 commit comments

Comments
 (0)