Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport #17964 to branch/v9 #19809

Merged
merged 3 commits into from
Jan 4, 2023
Merged

Backport #17964 to branch/v9 #19809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15697ee
Fix issue where gcp.credentialSecretName isn't needed (#17964)
adamstrawson Jan 3, 2023
460b62e
Merge branch 'branch/v9' into hugo/17964-to-branch/v9
hugoShaka Jan 4, 2023
bee2c47
Merge branch 'branch/v9' into hugo/17964-to-branch/v9
hugoShaka Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions examples/chart/teleport-cluster/.lint/gcp-ha-workload.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
clusterName: test-gcp-cluster
chartMode: gcp
gcp:
projectId: gcpproj-123456
backendTable: test-teleport-firestore-storage-collection
auditLogTable: test-teleport-firestore-auditlog-collection
sessionRecordingBucket: test-gcp-session-storage-bucket
credentialSecretName: ""
highAvailability:
replicaCount: 3
labels:
env: gcp
4 changes: 2 additions & 2 deletions examples/chart/teleport-cluster/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ spec:
secret:
secretName: "license"
{{- end }}
{{- if (eq .Values.chartMode "gcp") }}
{{- if and (.Values.gcp.credentialSecretName) (eq .Values.chartMode "gcp") }}
- name: gcp-credentials
secret:
secretName: {{ required "gcp.credentialSecretName is required in chart values" .Values.gcp.credentialSecretName }}
secretName: {{ .Values.gcp.credentialSecretName }}
{{- end }}
{{- if .Values.highAvailability.certManager.enabled }}
- name: teleport-tls
Expand Down
3 changes: 0 additions & 3 deletions examples/chart/teleport-cluster/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,6 @@
"gcp": {
"$id": "#/properties/gcp",
"type": "object",
"required": [
"credentialSecretName"
],
"properties": {
"projectId": {
"$id": "#/properties/gcp/properties/projectId",
Expand Down