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.

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: errors in otomi-db chart #1627

Merged
merged 1 commit into from
Jun 12, 2024
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
20 changes: 10 additions & 10 deletions charts/otomi-db/templates/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ spec:
{{- if eq .Values.backup.type "s3" }}
backup:
retentionPolicy: {{ .Values.backup.retentionPolicy }}
barmanObjectStore:
destinationPath: s3://{{ .Values.backup.s3.bucket }}
endpointURL: {{ .Values.backup.endpointURL }}
s3Credentials:
accessKeyId:
name: s3-creds
key: S3_STORAGE_ACCOUNT
secretAccessKey:
name: s3-creds
key: S3_STORAGE_KEY
barmanObjectStore:
destinationPath: s3://{{ .Values.backup.s3.bucket }}
endpointURL: {{ .Values.backup.s3.endpointURL }}
s3Credentials:
accessKeyId:
name: s3-creds
key: S3_STORAGE_ACCOUNT
secretAccessKey:
name: s3-creds
key: S3_STORAGE_KEY
{{- end }}
{{- if eq .Values.backup.type "gcs" }}
backup:
Expand Down
11 changes: 6 additions & 5 deletions tests/fixtures/env/apps/cnpg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ apps:
resources:
limits:
cpu: 1000m
memory: 1000Mi
memory: 512Mi
requests:
cpu: 100m
memory: 200Mi
storage:
azure:
accountName: name
containerName: database
type: azure
s3:
accessKeyId: 2C2F1864-3ADB-4D06-8F77-C82CAB6F0415
bucket: databases/
s3Url: https://nl-ams-1.linodeobjects.com
type: s3
4 changes: 2 additions & 2 deletions tests/fixtures/env/apps/secrets.cnpg.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apps:
cnpg:
storage:
azure:
accountKey: anAccountKey
s3:
secretAccessKey: superdupersecretacceskey
2 changes: 1 addition & 1 deletion tests/fixtures/env/settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ otomi:
platformBackups:
database:
harbor:
enabled: false
enabled: true
retentionPolicy: 7d
schedule: 0 0 0 * * *
persistentVolumes:
Expand Down