Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deployment/chainloop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ helm install [RELEASE_NAME] oci://ghcr.io/chainloop-dev/charts/chainloop \
# Secrets backend
--set secretsBackend.backend=gcpSecretManager \
--set secretsBackend.gcpSecretManager.projectId=[GCP Project ID] \
--set secretsBackend.gcpSecretManager.authKey=[GCP Auth KEY] \
--set secretsBackend.gcpSecretManager.serviceAccountKey=[GCP Auth KEY] \
# Server Auth KeyPair
# ...
```
Expand Down Expand Up @@ -317,7 +317,7 @@ secretsBackend:
backend: gcpSecretManager
gcpSecretManager:
projectId: [PROJECT_ID]
authKey: [KEY]
serviceAccountKey: [KEY]
```

### Send exceptions to Sentry
Expand Down Expand Up @@ -370,7 +370,7 @@ chainloop config save \
| `secretsBackend.awsSecretManager.secretKey` | AWS Secret Key | |
| `secretsBackend.awsSecretManager.region` | AWS Secret Manager Region | |
| `secretsBackend.gcpSecretManager.projectId` | GCP Project ID | |
| `secretsBackend.gcpSecretManager.authKey` | GCP Auth Key | |
| `secretsBackend.gcpSecretManager.serviceAccountKey` | GCP Auth Key | |

### Authentication

Expand Down
5 changes: 4 additions & 1 deletion deployment/chainloop/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ awsSecretManager:
gcpSecretManager:
secretPrefix: {{ required "secret prefix required" .secretPrefix | quote }}
projectId: {{ required "project id required" .gcpSecretManager.projectId | quote }}
authKey: {{ required "auth key required" .gcpSecretManager.authKey | quote }}
serviceAccountKey: "/gcp-secrets/serviceAccountKey.json"
{{- if eq .gcpSecretManager.serviceAccountKey "" }}
{{- fail ".Values.secretsBackend.gcpSecretManager.serviceAccountKey not set" }}
{{- end }}

{{- end }}
{{- end }}
Expand Down
9 changes: 9 additions & 0 deletions deployment/chainloop/templates/cas/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ spec:
mountPath: "/data/conf"
- name: jwt-public-key
mountPath: "/tmp"
{{- if eq "gcpSecretManager" .Values.secretsBackend.backend }}
- name: gcp-secretmanager-serviceaccountkey
mountPath: /gcp-secrets
{{- end }}
volumes:
- name: config
projected:
Expand All @@ -69,3 +73,8 @@ spec:
- name: jwt-public-key
secret:
secretName: {{ include "chainloop.cas.fullname" . }}-jwt-public-key
{{- if eq "gcpSecretManager" .Values.secretsBackend.backend }}
- name: gcp-secretmanager-serviceaccountkey
secret:
secretName: {{ include "chainloop.controlplane.fullname" . }}-gcp-secretmanager-serviceaccountkey
{{- end }}
11 changes: 11 additions & 0 deletions deployment/chainloop/templates/cas/gcp_secret_manager.secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{{- if eq "gcpSecretManager" .Values.secretsBackend.backend }}
apiVersion: v1
kind: Secret
metadata:
name: {{ include "chainloop.cas.fullname" . }}-gcp-secretmanager-serviceaccountkey
labels:
{{- include "chainloop.cas.labels" . | nindent 4 }}
type: Opaque
data:
serviceAccountKey.json: {{ .Values.secretsBackend.gcpSecretManager.serviceAccountKey | b64enc | quote }}
{{- end }}
9 changes: 9 additions & 0 deletions deployment/chainloop/templates/controlplane/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ spec:
mountPath: /tmp
- name: jwt-cas-private-key
mountPath: /secrets
{{- if eq "gcpSecretManager" .Values.secretsBackend.backend }}
- name: gcp-secretmanager-serviceaccountkey
mountPath: /gcp-secrets
{{- end }}
volumes:
- name: config
projected:
Expand All @@ -99,3 +103,8 @@ spec:
- name: jwt-cas-private-key
secret:
secretName: {{ include "chainloop.controlplane.fullname" . }}-jwt-cas
{{- if eq "gcpSecretManager" .Values.secretsBackend.backend }}
- name: gcp-secretmanager-serviceaccountkey
secret:
secretName: {{ include "chainloop.controlplane.fullname" . }}-gcp-secretmanager-serviceaccountkey
{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{{- if eq "gcpSecretManager" .Values.secretsBackend.backend }}
apiVersion: v1
kind: Secret
metadata:
name: {{ include "chainloop.controlplane.fullname" . }}-gcp-secretmanager-serviceaccountkey
labels:
{{- include "chainloop.controlplane.labels" . | nindent 4 }}
type: Opaque
data:
serviceAccountKey.json: {{ .Values.secretsBackend.gcpSecretManager.serviceAccountKey | b64enc | quote }}
{{- end }}
4 changes: 2 additions & 2 deletions deployment/chainloop/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ secretsBackend:
# region: ""

## @extra secretsBackend.gcpSecretManager.projectId GCP Project ID
## @extra secretsBackend.gcpSecretManager.authKey GCP Auth Key
## @extra secretsBackend.gcpSecretManager.serviceAccountKey GCP Auth Key
##
# gcpSecretManager:
# projectId: ""
# authKey: ""
# serviceAccountKey: ""

## @section Authentication
##
Expand Down