diff --git a/cnpg-liquid/Chart.yaml b/cnpg-liquid/Chart.yaml index b90eca7..d3bc87c 100644 --- a/cnpg-liquid/Chart.yaml +++ b/cnpg-liquid/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 1.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "1.0.0" diff --git a/cnpg-liquid/templates/cnpg-cluster.yaml b/cnpg-liquid/templates/cnpg-cluster.yaml index ff6e2bb..26a1cc2 100644 --- a/cnpg-liquid/templates/cnpg-cluster.yaml +++ b/cnpg-liquid/templates/cnpg-cluster.yaml @@ -20,10 +20,10 @@ spec: s3Credentials: accessKeyId: name: {{ .Values.s3.secretName | quote}} - key: {{ .Values.s3.accessKeyKey | quote }} + key: {{ .Values.s3.accessKeyRef | quote }} secretAccessKey: name: {{ .Values.s3.secretName | quote}} - key: {{ .Values.s3.secretKeyKey | quote }} + key: {{ .Values.s3.secretKeyRef | quote }} wal: maxParallel: 8 @@ -44,10 +44,10 @@ spec: s3Credentials: accessKeyId: name: {{ .Values.s3.secretName | quote}} - key: {{ .Values.s3.accessKeyKey | quote }} + key: {{ .Values.s3.accessKeyRef | quote }} secretAccessKey: name: {{ .Values.s3.secretName | quote}} - key: {{ .Values.s3.secretKeyKey | quote }} + key: {{ .Values.s3.secretKeyRef | quote }} wal: compression: bzip2 maxParallel: 8 diff --git a/cnpg-liquid/values.yaml b/cnpg-liquid/values.yaml index e6b0b00..46dddf6 100644 --- a/cnpg-liquid/values.yaml +++ b/cnpg-liquid/values.yaml @@ -1,15 +1,15 @@ s3: endpointUrl: https://storage.yandexcloud.net secretName: s3-credentials - accessKeyKey: ACCESS_KEY_ID - secretKeyKey: ACCESS_SECRET_KEY + accessKeyRef: ACCESS_KEY_ID + secretKeyRef: ACCESS_SECRET_KEY cnpg: clusterName: liquid-db backup: enable: true schedule: "0 0 0 * * *" - destinationPath: "s3://liquid-code/backup-hexcore" + destinationPath: "s3://liquid-code/backup" recovery: - enable: true + enable: false oldClusterName: liquid-db sourcePath: "s3://liquid-code/backup" \ No newline at end of file diff --git a/liquid-code-chart/templates/Deployments/backend-deployment.yaml b/liquid-code-chart/templates/Deployments/backend-deployment.yaml index 1b648c6..5434040 100644 --- a/liquid-code-chart/templates/Deployments/backend-deployment.yaml +++ b/liquid-code-chart/templates/Deployments/backend-deployment.yaml @@ -31,12 +31,12 @@ spec: valueFrom: secretKeyRef: name: {{ required "secretname!" .Values.s3.secretName | quote }} - key: {{ required "acces-key-key!" .Values.s3.accessKeyKey | quote }} + key: {{ required "acces-key-key!" .Values.s3.accessKeyRef | quote }} - name: S3_SECRET_KEY valueFrom: secretKeyRef: name: {{ .Values.s3.secretName | quote }} - key: {{ required "secret-key-key!" .Values.s3.secretKeyKey | quote }} + key: {{ required "secret-key-key!" .Values.s3.secretKeyRef | quote }} - name: TESTING_MODULE_URL value: http://{{ .Release.Name }}-queue-service:8080/ - name: PG_URI diff --git a/liquid-code-chart/values.yaml b/liquid-code-chart/values.yaml index d1ce437..632cbb6 100644 --- a/liquid-code-chart/values.yaml +++ b/liquid-code-chart/values.yaml @@ -1,10 +1,9 @@ s3: endpointUrl: https://storage.yandexcloud.net secretName: s3-credentials - accessKeyKey: ACCESS_KEY_ID - secretKeyKey: ACCESS_SECRET_KEY + accessKeyRef: ACCESS_KEY_ID + secretKeyRef: ACCESS_SECRET_KEY privateBucket: liquid-code - publicBucket: liquid-code-public jwt: secretName: jwt-secrets database: