Skip to content

Commit

Permalink
fix secret names (#1834)
Browse files Browse the repository at this point in the history
Signed-off-by: Jose I. Paris <[email protected]>
  • Loading branch information
jiparis authored Feb 19, 2025
1 parent bfa42fe commit 892cf6e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion deployment/chainloop/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions deployment/chainloop/templates/controlplane/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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" . }}
Expand Down Expand Up @@ -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 }}
Expand Down
10 changes: 5 additions & 5 deletions deployment/chainloop/templates/controlplane/secret-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 892cf6e

Please sign in to comment.