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

Include support bundle & preflight checks in helm installation #650

Merged
merged 2 commits into from
Dec 26, 2024
Merged

Include support bundle & preflight checks in helm installation #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb0b4f3
Include support bundle & preflight checks in helm installation
moicalcob Dec 17, 2024
0675df7
Finish changes
moicalcob Dec 18, 2024
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
66 changes: 63 additions & 3 deletions chart/templates/_commonChecks.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,29 @@ Return common collectors for preflights and support-bundle
done
env:
{{- if not .Values.commonBackendServiceAccount.enableGCPWorkloadIdentity }}
{{- if eq .Values.cartoSecrets.defaultGoogleServiceAccount.existingSecret.name "" }}
- name: DEFAULT_SERVICE_ACCOUNT_KEY__FILE_CONTENT
value: {{ .Values.cartoSecrets.defaultGoogleServiceAccount.value | b64enc | quote }}
{{- else }}
- name: DEFAULT_SERVICE_ACCOUNT_KEY__FILE_CONTENT
valueFrom:
secretKeyRef:
name: {{ .Values.cartoSecrets.defaultGoogleServiceAccount.existingSecret.name | quote }}
key: {{ .Values.cartoSecrets.defaultGoogleServiceAccount.existingSecret.key | quote }}
{{- end }}
- name: DEFAULT_SERVICE_ACCOUNT_KEY__FILE_PATH
value: {{ include "carto.google.secretMountAbsolutePath" . }}
{{- if ( include "carto.googleCloudStorageServiceAccountKey.used" . ) }}
{{- if eq .Values.appSecrets.googleCloudStorageServiceAccountKey.existingSecret.name "" }}
- name: STORAGE_SERVICE_ACCOUNT_KEY__FILE_CONTENT
value: {{ .Values.appSecrets.googleCloudStorageServiceAccountKey.value | b64enc | quote }}
{{- else }}
- name: STORAGE_SERVICE_ACCOUNT_KEY__FILE_CONTENT
valueFrom:
secretKeyRef:
name: {{ .Values.appSecrets.googleCloudStorageServiceAccountKey.existingSecret.name | quote }}
key: {{ .Values.appSecrets.googleCloudStorageServiceAccountKey.existingSecret.key | quote }}
{{- end }}
- name: STORAGE_SERVICE_ACCOUNT_KEY__FILE_PATH
value: {{ include "carto.googleCloudStorageServiceAccountKey.secretMountAbsolutePath" . }}
{{- end }}
Expand Down Expand Up @@ -510,28 +526,72 @@ Return customer values to use in preflights and support-bundle
Return customer secrets to use in preflights and support-bundle
*/}}
{{- define "carto.replicated.tenantRequirementsChecker.customerSecrets" }}
{{- if eq .Values.externalPostgresql.existingSecret "" -}}
- name: WORKSPACE_POSTGRES_PASSWORD
value: {{ .Values.externalPostgresql.password | quote }}
{{- else }}
- name: WORKSPACE_POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "carto.postgresql.secretName" . }}
key: {{ include "carto.postgresql.secret.key" . }}
{{- end -}}
{{- if eq .Values.externalRedis.existingSecret "" -}}
- name: REDIS_PASSWORD
value: {{ .Values.externalRedis.password | quote }}
{{- else }}
- name: REDIS_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "carto.redis.secretName" . }}
key: {{ include "carto.redis.existingsecret.key" . | quote }}
{{- end -}}
{{- if eq .Values.cartoSecrets.launchDarklySdkKey.existingSecret.name "" }}
- name: LAUNCHDARKLY_SDK_KEY
value: {{ .Values.cartoSecrets.launchDarklySdkKey.value | quote }}
{{- if eq .Values.appConfigValues.storageProvider "s3" }}
{{- else -}}
{{ include "carto._utils.generateSecretDef" (dict "var" "LAUNCHDARKLY_SDK_KEY" "context" .) | nindent 2 }}
{{- end -}}
{{- if eq .Values.appConfigValues.storageProvider "s3" -}}
{{- if eq .Values.appSecrets.awsAccessKeyId.existingSecret.name "" }}
moicalcob marked this conversation as resolved.
Show resolved Hide resolved
- name: WORKSPACE_THUMBNAILS_ACCESSKEYID
value: {{ .Values.appSecrets.awsAccessKeyId.value | quote }}
{{- else -}}
{{ include "carto._utils.generateSecretDef" (dict "var" "WORKSPACE_THUMBNAILS_ACCESSKEYID" "context" .) | nindent 2 }}
{{- end -}}
{{- if eq .Values.appSecrets.awsAccessKeyId.existingSecret.name "" }}
- name: WORKSPACE_IMPORTS_ACCESSKEYID
value: {{ .Values.appSecrets.awsAccessKeyId.value | quote }}
{{- else -}}
{{ include "carto._utils.generateSecretDef" (dict "var" "WORKSPACE_IMPORTS_ACCESSKEYID" "context" .) | nindent 2 }}
{{- end -}}
{{- if eq .Values.appSecrets.awsAccessKeySecret.existingSecret.name "" }}
- name: WORKSPACE_THUMBNAILS_SECRETACCESSKEY
value: {{ .Values.appSecrets.awsAccessKeySecret.value | quote }}
{{- else -}}
{{ include "carto._utils.generateSecretDef" (dict "var" "WORKSPACE_THUMBNAILS_SECRETACCESSKEY" "context" .) | nindent 2 }}
{{- end -}}
{{- if eq .Values.appSecrets.awsAccessKeySecret.existingSecret.name "" }}
- name: WORKSPACE_IMPORTS_SECRETACCESSKEY
value: {{ .Values.appSecrets.awsAccessKeySecret.value | quote }}
{{- end }}
{{- else -}}
{{ include "carto._utils.generateSecretDef" (dict "var" "WORKSPACE_IMPORTS_SECRETACCESSKEY" "context" .) | nindent 2 }}
{{- end -}}
{{- end -}}
{{- if eq .Values.appConfigValues.storageProvider "azure-blob" }}
{{- if eq .Values.appSecrets.azureStorageAccessKey.existingSecret.name "" }}
- name: WORKSPACE_THUMBNAILS_STORAGE_ACCESSKEY
value: {{ .Values.appSecrets.azureStorageAccessKey.value | quote }}
{{- else -}}
{{ include "carto._utils.generateSecretDef" (dict "var" "WORKSPACE_THUMBNAILS_STORAGE_ACCESSKEY" "context" .) | nindent 2 }}
{{- end -}}
{{- if eq .Values.appSecrets.azureStorageAccessKey.existingSecret.name "" }}
- name: WORKSPACE_IMPORTS_STORAGE_ACCESSKEY
value: {{ .Values.appSecrets.azureStorageAccessKey.value | quote }}
{{- end }}
{{- else -}}
{{ include "carto._utils.generateSecretDef" (dict "var" "WORKSPACE_IMPORTS_STORAGE_ACCESSKEY" "context" .) | nindent 2 }}
{{- end -}}
{{- end -}}
{{- end -}}


Expand Down
2 changes: 0 additions & 2 deletions chart/templates/preflight.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{- if .Values.replicated.enabled }}
apiVersion: v1
kind: Secret
metadata:
Expand All @@ -18,4 +17,3 @@ stringData:
{{- include "carto.replicated.commonChecks.collectors" . | indent 6 }}
analyzers:
{{- include "carto.replicated.commonChecks.analyzers" . | indent 6 }}
{{- end }}
2 changes: 0 additions & 2 deletions chart/templates/support-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{- if .Values.replicated.enabled }}
apiVersion: v1
kind: Secret
metadata:
Expand Down Expand Up @@ -71,4 +70,3 @@ stringData:
when: "!= Healthy" # Catch all unhealthy pods. A pod is considered healthy if it has a status of Completed, or Running and all of its containers are ready.
# {{ printf "{{ .Status.Reason }}" }} displays the current status of the pod, while {{ printf "{{ .Status.Message }}" }} provides a detailed explanation of why the pod is unhealthy, based on logged events.
message: Pod {{ printf "{{ .Namespace }}" }}/{{ printf "{{ .Name }}" }} is unhealthy with a status of {{ printf "{{ .Status.Reason }}" }}. Message is {{ printf "{{ .Status.Message }}" }}
{{- end }}