Merge pull request #435 from celo-org/batcher-proposer-tls-secret

Batcher/Proposer TLS secret names
celo-org · Nov 26, 2024 · 151835c · 151835c
2 parents 6879c02 + 1ba9857
commit 151835c
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/charts/op-batcher/Chart.yaml b/charts/op-batcher/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 name: op-batcher
 apiVersion: v2
-version: 0.2.2
+version: 0.2.3
 description: Celo implementation for op-batcher client (Optimism Rollup)
 home: https://clabs.co
 sources:

diff --git a/charts/op-batcher/README.md b/charts/op-batcher/README.md
@@ -1,6 +1,6 @@
 # op-batcher
 
-![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 Celo implementation for op-batcher client (Optimism Rollup)
 

diff --git a/charts/op-batcher/templates/certificate.yaml b/charts/op-batcher/templates/certificate.yaml
@@ -2,9 +2,9 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: {{ template "op-batcher.fullname" . }}
+  name: {{ template "op-batcher.fullname" . }}-tls
 spec:
-  secretName: {{ template "op-batcher.fullname" . }}
+  secretName: {{ template "op-batcher.fullname" . }}-tls
   privateKey:
     algorithm: RSA
     encoding: PKCS1

diff --git a/charts/op-batcher/templates/statefulset.yaml b/charts/op-batcher/templates/statefulset.yaml
@@ -208,5 +208,5 @@ spec:
       volumes:
       - name: pki
         secret:
-          secretName: {{ ternary (include "op-batcher.fullname" .) .Values.config.signer.tls.externalSecret.tlsSecretName .Values.config.signer.tls.certManager.enabled }}
+          secretName: {{ ternary (printf "%s-%s" (include "op-batcher.fullname" .) "tls" ) .Values.config.signer.tls.externalSecret.tlsSecretName .Values.config.signer.tls.certManager.enabled }}
       {{- end }}
diff --git a/charts/op-proposer/Chart.yaml b/charts/op-proposer/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 name: op-proposer
 apiVersion: v2
-version: 0.2.1
+version: 0.2.2
 description: Celo implementation for op-proposer client (Optimism Rollup)
 home: https://clabs.co
 sources:

diff --git a/charts/op-proposer/README.md b/charts/op-proposer/README.md
@@ -1,6 +1,6 @@
 # op-proposer
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 Celo implementation for op-proposer client (Optimism Rollup)
 

diff --git a/charts/op-proposer/templates/certificate.yaml b/charts/op-proposer/templates/certificate.yaml
@@ -2,9 +2,9 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: {{ template "op-proposer.fullname" . }}
+  name: {{ template "op-proposer.fullname" . }}-tls
 spec:
-  secretName: {{ template "op-proposer.fullname" . }}
+  secretName: {{ template "op-proposer.fullname" . }}-tls
   privateKey:
     algorithm: RSA
     encoding: PKCS1

diff --git a/charts/op-proposer/templates/statefulset.yaml b/charts/op-proposer/templates/statefulset.yaml
@@ -190,5 +190,5 @@ spec:
       {{- if .Values.config.signer.tls.enabled }}
       - name: pki
         secret:
-          secretName: {{ ternary (include "op-proposer.fullname" .) .Values.config.signer.tls.externalSecret.tlsSecretName .Values.config.signer.tls.certManager.enabled }}
+          secretName: {{ ternary (printf "%s-%s" (include "op-batcher.fullname" .) "tls" ) .Values.config.signer.tls.externalSecret.tlsSecretName .Values.config.signer.tls.certManager.enabled }}
       {{- end }}