Skip to content

Commit a250ff5

Browse files
committed
use proper key in sercret manager service account configuration
- update helm chart README - be consitent in chart template and use 'serviceAccountKey' everywhere Signed-off-by: Christophe de Carvalho <christophe@archipelo.co>
1 parent 26f087d commit a250ff5

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

deployment/chainloop/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ helm install [RELEASE_NAME] oci://ghcr.io/chainloop-dev/charts/chainloop \
9999
# Secrets backend
100100
--set secretsBackend.backend=gcpSecretManager \
101101
--set secretsBackend.gcpSecretManager.projectId=[GCP Project ID] \
102-
--set secretsBackend.gcpSecretManager.authKey=[GCP Auth KEY] \
102+
--set secretsBackend.gcpSecretManager.serviceAccountKey=[GCP Auth KEY] \
103103
# Server Auth KeyPair
104104
# ...
105105
```
@@ -317,7 +317,7 @@ secretsBackend:
317317
backend: gcpSecretManager
318318
gcpSecretManager:
319319
projectId: [PROJECT_ID]
320-
authKey: [KEY]
320+
serviceAccountKey: [KEY]
321321
```
322322

323323
### Send exceptions to Sentry
@@ -370,7 +370,7 @@ chainloop config save \
370370
| `secretsBackend.awsSecretManager.secretKey` | AWS Secret Key | |
371371
| `secretsBackend.awsSecretManager.region` | AWS Secret Manager Region | |
372372
| `secretsBackend.gcpSecretManager.projectId` | GCP Project ID | |
373-
| `secretsBackend.gcpSecretManager.authKey` | GCP Auth Key | |
373+
| `secretsBackend.gcpSecretManager.serviceAccountKey` | GCP Auth Key | |
374374
375375
### Authentication
376376

deployment/chainloop/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ awsSecretManager:
8282
gcpSecretManager:
8383
secretPrefix: {{ required "secret prefix required" .secretPrefix | quote }}
8484
projectId: {{ required "project id required" .gcpSecretManager.projectId | quote }}
85-
authKey: "/gcp-secrets/authKey.json"
85+
serviceAccountKey: "/gcp-secrets/serviceAccountKey.json"
8686

8787
{{- end }}
8888
{{- end }}

deployment/chainloop/templates/cas/deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
- name: jwt-public-key
6060
mountPath: "/tmp"
6161
{{- if eq "gcpSecretManager" .Values.secretsBackend.backend }}
62-
- name: gcp-secretmanager-authkey
62+
- name: gcp-secretmanager-serviceaccountkey
6363
mountPath: /gcp-secrets
6464
{{- end }}
6565
volumes:
@@ -74,7 +74,7 @@ spec:
7474
secret:
7575
secretName: {{ include "chainloop.cas.fullname" . }}-jwt-public-key
7676
{{- if eq "gcpSecretManager" .Values.secretsBackend.backend }}
77-
- name: gcp-secretmanager-authkey
77+
- name: gcp-secretmanager-serviceaccountkey
7878
secret:
79-
secretName: {{ include "chainloop.controlplane.fullname" . }}-gcp-secretmanager-authkey
79+
secretName: {{ include "chainloop.controlplane.fullname" . }}-gcp-secretmanager-serviceaccountkey
8080
{{- end }}

deployment/chainloop/templates/cas/gcp_secret_manager.secret.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: v1
33
kind: Secret
44
metadata:
5-
name: {{ include "chainloop.cas.fullname" . }}-gcp-secretmanager-authkey
5+
name: {{ include "chainloop.cas.fullname" . }}-gcp-secretmanager-serviceaccountkey
66
labels:
77
{{- include "chainloop.cas.labels" . | nindent 4 }}
88
type: Opaque
99
data:
10-
authKey.json: {{ .Values.secretsBackend.gcpSecretManager.authKey | b64enc | quote }}
10+
serviceAccountKey.json: {{ .Values.secretsBackend.gcpSecretManager.serviceAccountKey | b64enc | quote }}
1111
{{- end }}

deployment/chainloop/templates/controlplane/deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ spec:
8686
- name: jwt-cas-private-key
8787
mountPath: /secrets
8888
{{- if eq "gcpSecretManager" .Values.secretsBackend.backend }}
89-
- name: gcp-secretmanager-authkey
89+
- name: gcp-secretmanager-serviceaccountkey
9090
mountPath: /gcp-secrets
9191
{{- end }}
9292
volumes:
@@ -104,7 +104,7 @@ spec:
104104
secret:
105105
secretName: {{ include "chainloop.controlplane.fullname" . }}-jwt-cas
106106
{{- if eq "gcpSecretManager" .Values.secretsBackend.backend }}
107-
- name: gcp-secretmanager-authkey
107+
- name: gcp-secretmanager-serviceaccountkey
108108
secret:
109-
secretName: {{ include "chainloop.controlplane.fullname" . }}-gcp-secretmanager-authkey
109+
secretName: {{ include "chainloop.controlplane.fullname" . }}-gcp-secretmanager-serviceaccountkey
110110
{{- end }}

deployment/chainloop/templates/controlplane/gcp_secret_manager.secret.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
apiVersion: v1
33
kind: Secret
44
metadata:
5-
name: {{ include "chainloop.controlplane.fullname" . }}-gcp-secretmanager-authkey
5+
name: {{ include "chainloop.controlplane.fullname" . }}-gcp-secretmanager-serviceaccountkey
66
labels:
77
{{- include "chainloop.controlplane.labels" . | nindent 4 }}
88
type: Opaque
99
data:
10-
authKey.json: {{ .Values.secretsBackend.gcpSecretManager.authKey | b64enc | quote }}
10+
serviceAccountKey.json: {{ .Values.secretsBackend.gcpSecretManager.serviceAccountKey | b64enc | quote }}
1111
{{- end }}

deployment/chainloop/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ secretsBackend:
5555
# region: ""
5656

5757
## @extra secretsBackend.gcpSecretManager.projectId GCP Project ID
58-
## @extra secretsBackend.gcpSecretManager.authKey GCP Auth Key
58+
## @extra secretsBackend.gcpSecretManager.serviceAccountKey GCP Auth Key
5959
##
6060
# gcpSecretManager:
6161
# projectId: ""
62-
# authKey: ""
62+
# serviceAccountKey: ""
6363

6464
## @section Authentication
6565
##

0 commit comments

Comments
 (0)