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

Fix S3 Configuration, Liveness Probe, and PVC Condition for Compatibility #76

Closed
wants to merge 2 commits into from
Closed

Fix S3 Configuration, Liveness Probe, and PVC Condition for Compatibility #76

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
9d998e4
Remove requirements.lock, fix api-deployment
kabooboo Oct 11, 2024
f5967c5
Remove aws.s3 which was removed in PR !66
kabooboo Oct 11, 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
9 changes: 0 additions & 9 deletions requirements.lock
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions templates/api-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ spec:
{{ end }}
- name: LAGO_AWS_S3_REGION
value: {{ if .Values.global.s3.enabled }}
{{ .Values.global.s3.aws.region | quote }}
{{ .Values.global.s3.region | quote }}
{{ else if .Values.minio.enabled }}
{{ default "us-east-1" .Values.minio.region | quote }}
{{ end }}
Expand Down Expand Up @@ -251,13 +251,13 @@ spec:
resources:
{{- toYaml . | nindent 12}}
{{- end }}
{{- if and (not .Values.global.s3.enabled) (not .Values.minio.enabled) -}}
{{- if and (not .Values.global.s3.enabled) (not .Values.minio.enabled) }}
volumeMounts:
- mountPath: /app/storage
name: {{ .Release.Name }}-storage-data
{{ end }}
restartPolicy: Always
{{- if and (not .Values.global.s3.enabled) (not .Values.minio.enabled) -}}
{{- if and (not .Values.global.s3.enabled) (not .Values.minio.enabled) }}
volumes:
- name: {{ .Release.Name }}-storage-data
persistentVolumeClaim:
Expand Down
8 changes: 4 additions & 4 deletions templates/secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ data:

{{- if not .Values.global.existingSecret }}
{{ if .Values.global.s3.enabled }}
{{ if .Values.global.s3.aws.accessKeyId }}
awsS3AccessKeyId: {{ .Values.global.s3.aws.accessKeyId | b64enc }}
{{ if .Values.global.s3.accessKeyId }}
awsS3AccessKeyId: {{ .Values.global.s3.accessKeyId | b64enc }}
{{ end }}
{{ if .Values.global.s3.aws.secretAccessKey }}
awsS3SecretAccessKey: {{ .Values.global.s3.aws.secretAccessKey | b64enc }}
{{ if .Values.global.s3.secretAccessKey }}
awsS3SecretAccessKey: {{ .Values.global.s3.secretAccessKey | b64enc }}
{{ end }}
{{ if eq .Values.global.s3.provider "minio" }}
{{ if .Values.global.s3.minio.accessKeyId }}
Expand Down
12 changes: 6 additions & 6 deletions templates/worker-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,28 +119,28 @@ spec:
{{ if .Values.global.s3.enabled }}
- name: LAGO_USE_AWS_S3
value: "true"
{{ if .Values.global.s3.aws.endpoint }}
{{ if .Values.global.s3.endpoint }}
- name: LAGO_AWS_S3_ENDPOINT
value: {{ .Values.global.s3.aws.endpoint | quote }}
value: {{ .Values.global.s3.endpoint | quote }}
{{ end }}
{{ if or .Values.global.s3.aws.accessKeyId .Values.global.existingSecret }}
{{ if or .Values.global.s3.accessKeyId .Values.global.existingSecret }}
- name: LAGO_AWS_S3_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: {{ include "secret-path" . }}
key: awsS3AccessKeyId
{{ end }}
{{ if or .Values.global.s3.aws.secretAccessKey .Values.global.existingSecret }}
{{ if or .Values.global.s3.secretAccessKey .Values.global.existingSecret }}
- name: LAGO_AWS_S3_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: {{ include "secret-path" . }}
key: awsS3SecretAccessKey
{{ end }}
- name: LAGO_AWS_S3_BUCKET
value: {{ .Values.global.s3.aws.bucket | quote }}
value: {{ .Values.global.s3.bucket | quote }}
- name: LAGO_AWS_S3_REGION
value: {{ .Values.global.s3.aws.region | quote }}
value: {{ .Values.global.s3.region | quote }}
{{ end }}
{{ if .Values.global.smtp.enabled }}
- name: LAGO_FROM_EMAIL
Expand Down
Loading