From 892cf6ebf0b14a6c3da40382662f523334287776 Mon Sep 17 00:00:00 2001 From: "Jose I. Paris" Date: Wed, 19 Feb 2025 11:18:39 +0100 Subject: [PATCH] fix secret names (#1834) Signed-off-by: Jose I. Paris --- deployment/chainloop/Chart.yaml | 2 +- .../chainloop/templates/controlplane/deployment.yaml | 8 ++++---- .../templates/controlplane/secret-config.yaml | 10 +++++----- .../templates/controlplane/secrets-signer-ca.yaml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deployment/chainloop/Chart.yaml b/deployment/chainloop/Chart.yaml index 624f8ded0..633a791a3 100644 --- a/deployment/chainloop/Chart.yaml +++ b/deployment/chainloop/Chart.yaml @@ -7,7 +7,7 @@ description: Chainloop is an open source software supply chain control plane, a type: application # Bump the patch (not minor, not major) version on each change in the Chart Source code -version: 1.184.0 +version: 1.184.1 # Do not update appVersion, this is handled automatically by the release process appVersion: v0.166.0 diff --git a/deployment/chainloop/templates/controlplane/deployment.yaml b/deployment/chainloop/templates/controlplane/deployment.yaml index ac8b1ac57..39ad19435 100644 --- a/deployment/chainloop/templates/controlplane/deployment.yaml +++ b/deployment/chainloop/templates/controlplane/deployment.yaml @@ -160,8 +160,8 @@ spec: {{- end }} {{- if .Values.controlplane.keylessSigning.enabled }} {{- range $index, $backend := .Values.controlplane.keylessSigning.backends }} - - name: sign-backend-{{$backend.type}}-{{$index}} - mountPath: /sign_secrets_{{$backend.type}}_{{$index}} + - name: sign-backend-{{$backend.type | lower}}-{{$index}} + mountPath: /sign_secrets_{{$backend.type | lower}}_{{$index}} {{- end }} {{- end }} {{- if include "controlplane.tls-secret-name" . }} @@ -230,9 +230,9 @@ spec: {{- end }} {{- if and .Values.controlplane.keylessSigning.enabled }} {{- range $index, $backend := .Values.controlplane.keylessSigning.backends }} - - name: sign-backend-{{$backend.type}}-{{$index}} + - name: sign-backend-{{$backend.type | lower}}-{{$index}} secrets: - secretName: {{ include "chainloop.controlplane.fullname" $ }}-keyless-{{$backend.type}}-{{$index}} + secretName: {{ include "chainloop.controlplane.fullname" $ }}-keyless-{{$backend.type | lower}}-{{$index}} {{- end }} {{- end }} {{- if .Values.controlplane.extraVolumes }} diff --git a/deployment/chainloop/templates/controlplane/secret-config.yaml b/deployment/chainloop/templates/controlplane/secret-config.yaml index 5af372ea5..c352594a3 100644 --- a/deployment/chainloop/templates/controlplane/secret-config.yaml +++ b/deployment/chainloop/templates/controlplane/secret-config.yaml @@ -61,17 +61,17 @@ stringData: {{- with $backend.fileCA }} - issuer: {{default false $backend.issuer }} file_ca: - cert_path: "/sign_secrets_{{$backend.type}}_{{$index}}/file_ca.cert" - key_path: "/sign_secrets_{{$backend.type}}_{{$index}}/file_ca.key" + cert_path: "/sign_secrets_{{$backend.type | lower}}_{{$index}}/file_ca.cert" + key_path: "/sign_secrets_{{$backend.type | lower}}_{{$index}}/file_ca.key" key_pass: "{{- required "FileCA keyPass is mandatory" .keyPass }}" {{- end }} {{- else if eq "ejbcaCA" $backend.type }} {{- with $backend.ejbcaCA }} - issuer: {{default false $backend.issuer}} ejbca_ca: - cert_path: "/sign_secrets_{{$backend.type}}_{{$index}}/ejbca_client.cert" - key_path: "/sign_secrets_{{$backend.type}}_{{$index}}/ejbca_client.key" - root_ca_path: "/sign_secrets_{{$backend.type}}_{{$index}}/ejbca_ca.cert" + cert_path: "/sign_secrets_{{$backend.type | lower}}_{{$index}}/ejbca_client.cert" + key_path: "/sign_secrets_{{$backend.type | lower}}_{{$index}}/ejbca_client.key" + root_ca_path: "/sign_secrets_{{$backend.type | lower}}_{{$index}}/ejbca_ca.cert" server_url: "{{- required "EJBCA server URL is mandatory" .serverURL }}" certificate_profile_name: "{{- required "EJBCA certificate profile name is mandatory" .certProfileName }}" end_entity_profile_name: "{{- required "EJBCA end entity profile name is mandatory" .endEntityProfileName }}" diff --git a/deployment/chainloop/templates/controlplane/secrets-signer-ca.yaml b/deployment/chainloop/templates/controlplane/secrets-signer-ca.yaml index 273627294..ed8d1a3ef 100644 --- a/deployment/chainloop/templates/controlplane/secrets-signer-ca.yaml +++ b/deployment/chainloop/templates/controlplane/secrets-signer-ca.yaml @@ -10,7 +10,7 @@ SPDX-License-Identifier: APACHE-2.0 apiVersion: v1 kind: Secret metadata: - name: {{ include "chainloop.controlplane.fullname" $ }}-keyless-{{$backend.type}}-{{$index}} + name: {{ include "chainloop.controlplane.fullname" $ }}-keyless-{{$backend.type | lower}}-{{$index}} labels: {{- include "chainloop.controlplane.labels" $ | nindent 4 }} type: Opaque