Compare commits

...

5 Commits

7 changed files with 28 additions and 14 deletions

View File

@@ -1,6 +1,6 @@
apiVersion: v2 apiVersion: v2
name: postgres-cluster name: postgres-cluster
version: 2.2.0 version: 2.3.1
description: Chart for cloudnative-pg cluster description: Chart for cloudnative-pg cluster
keywords: keywords:
- database - database

View File

@@ -3,7 +3,7 @@
backup: backup:
retentionPolicy: {{ .Values.backup.retentionPolicy }} retentionPolicy: {{ .Values.backup.retentionPolicy }}
barmanObjectStore: barmanObjectStore:
destinationPath: "s3://{{ .Values.backup.endpointBucket }}/{{ .Values.kubernetesClusterName }}/postgresql/{{ include "cluster.name" . }}" destinationPath: "s3://{{ .Values.backup.endpointBucket }}/{{ .Values.kubernetesClusterName }}/postgresql/{{ include "cluster.backupName" . }}"
endpointURL: {{ .Values.backup.endpointURL }} endpointURL: {{ .Values.backup.endpointURL }}
{{- if .Values.backup.endpointCA }} {{- if .Values.backup.endpointCA }}
endpointCA: endpointCA:

View File

@@ -63,7 +63,7 @@ externalClusters:
- name: "{{ include "cluster.name" . }}-backup-{{ .Values.recovery.recoveryIndex }}" - name: "{{ include "cluster.name" . }}-backup-{{ .Values.recovery.recoveryIndex }}"
barmanObjectStore: barmanObjectStore:
serverName: "{{ include "cluster.name" . }}-backup-{{ .Values.recovery.recoveryIndex }}" serverName: "{{ include "cluster.name" . }}-backup-{{ .Values.recovery.recoveryIndex }}"
destinationPath: "s3://{{ .Values.recovery.endpointBucket }}/{{ .Values.kubernetesClusterName }}/postgresql/{{ .Values.recovery.recoveryName }}" destinationPath: "s3://{{ .Values.recovery.endpointBucket }}/{{ .Values.kubernetesClusterName }}/postgresql/{{ include "cluster.recoveryName" . }}"
endpointURL: {{ .Values.recovery.endpointURL }} endpointURL: {{ .Values.recovery.endpointURL }}
{{- with .Values.recovery.endpointCA }} {{- with .Values.recovery.endpointCA }}
endpointCA: endpointCA:

View File

@@ -5,7 +5,7 @@ Expand the name of the chart.
{{- if .Values.nameOverride }} {{- if .Values.nameOverride }}
{{- .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- else }} {{- else }}
{{- printf "postgresql-%s-%s" .Values.cluster.image.majorVersion .Release.Name | trunc 63 | trimSuffix "-" -}} {{- printf "%s-postgresql-%s" .Release.Name ((semver .Values.cluster.image.tag).Major | toString) | trunc 63 | trimSuffix "-" -}}
{{- end }} {{- end }}
{{- end }} {{- end }}
@@ -56,6 +56,18 @@ Generate name for object store credentials
{{- end }} {{- end }}
{{- end }} {{- end }}
{{/*
Generate backup server name
*/}}
{{- define "cluster.backupName" -}}
{{- if .Values.backup.backupName -}}
{{- .Values.backup.backupName -}}
{{- else -}}
{{ include "cluster.name" . }}
{{- end }}
{{- end }}
{{/* {{/*
Generate recovery server name Generate recovery server name
*/}} */}}

View File

@@ -24,7 +24,6 @@ cluster:
image: image:
repository: ghcr.io/cloudnative-pg/postgresql repository: ghcr.io/cloudnative-pg/postgresql
tag: "16.2" tag: "16.2"
majorVersion: "16"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# The UID and GID of the postgres user inside the image # The UID and GID of the postgres user inside the image
@@ -171,6 +170,9 @@ backup:
# Generate external cluster name, creates: postgresql-{{ .Release.Name }}-cluster-backup-index-{{ .Values.backups.backupIndex }}" # Generate external cluster name, creates: postgresql-{{ .Release.Name }}-cluster-backup-index-{{ .Values.backups.backupIndex }}"
backupIndex: 1 backupIndex: 1
# Name of the backup cluster in the object store, defaults to "cluster.name"
backupName: ""
wal: wal:
# WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`. # WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
compression: snappy compression: snappy

View File

@@ -1,6 +1,6 @@
apiVersion: v2 apiVersion: v2
name: tubearchivist name: tubearchivist
version: 0.2.1 version: 0.2.2
description: Chart for Tube Archivist description: Chart for Tube Archivist
keywords: keywords:
- download - download

View File

@@ -20,18 +20,18 @@ service:
port: 8000 port: 8000
ingress: ingress:
enabled: false enabled: false
className: className: ""
annotations: annotations: ""
host: host: ""
persistence: persistence:
cache: cache:
enabled: false enabled: false
storageClassName: default storageClassName: ""
storageSize: 5Gi storageSize: 5Gi
accessMode: ReadWriteOnce accessMode: ReadWriteOnce
volumeMode: Filesystem volumeMode: Filesystem
youtube: youtube:
claimName: claimName: ""
redis: redis:
image: image:
repository: redis/redis-stack-server repository: redis/redis-stack-server
@@ -48,17 +48,17 @@ redis:
loadmodule /opt/redis-stack/lib/rejson.so loadmodule /opt/redis-stack/lib/rejson.so
elasticsearch: elasticsearch:
global: global:
storageClass: default storageClass: ""
extraEnvVars: extraEnvVars:
- name: "discovery.type" - name: "discovery.type"
value: "single-node" value: "single-node"
- name: xpack.security.enabled - name: xpack.security.enabled
value: "true" value: "true"
extraEnvVarsSecret: extraEnvVarsSecret: []
extraConfig: extraConfig:
path: path:
repo: /usr/share/elasticsearch/data/snapshot repo: /usr/share/elasticsearch/data/snapshot
extraVolumes: extraVolumes: []
extraVolumeMounts: extraVolumeMounts:
- name: snapshot - name: snapshot
mountPath: /usr/share/elasticsearch/data/snapshot mountPath: /usr/share/elasticsearch/data/snapshot