From 797b8745c3ab7b488b5fb358fd44ddcd5f3ada1d Mon Sep 17 00:00:00 2001
From: Rufus Deponian <deponian@pm.me>
Date: Thu, 18 Jul 2024 21:08:01 +0500
Subject: [PATCH] Update cloudsql-backup chart

---
 charts/cloudsql-backup/Chart.yaml                |  6 ++----
 charts/cloudsql-backup/pgrestic.dockerfile       | 16 ++++++++--------
 .../templates/backup-check-cronjob.yaml          |  2 +-
 .../templates/backup-cleanup-cronjob.yaml        |  2 +-
 .../templates/backup-create-cronjob.yaml         |  2 +-
 .../templates/backup-prune-cronjob.yaml          |  2 +-
 .../templates/backup-unlock-cronjob.yaml         |  2 +-
 charts/cloudsql-backup/values.yaml               |  2 +-
 8 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/charts/cloudsql-backup/Chart.yaml b/charts/cloudsql-backup/Chart.yaml
index 8cbed5d..1c7894d 100644
--- a/charts/cloudsql-backup/Chart.yaml
+++ b/charts/cloudsql-backup/Chart.yaml
@@ -1,11 +1,9 @@
 apiVersion: v2
-appVersion: "0.12.0"
+appVersion: "0.16.5"
 description: A Helm chart for periodical backup of cloud postgresql
 name: cloudsql-backup
-version: 0.8.1
+version: 0.9.0
 maintainers:
-  - name: Maxim Filatov
-    email: bregor@evilmartians.com
   - name: Kirill Kuznetsov
     email: kir@evilmartians.com
   - name: Ilya Cherepanov
diff --git a/charts/cloudsql-backup/pgrestic.dockerfile b/charts/cloudsql-backup/pgrestic.dockerfile
index 3eade02..f134743 100644
--- a/charts/cloudsql-backup/pgrestic.dockerfile
+++ b/charts/cloudsql-backup/pgrestic.dockerfile
@@ -1,15 +1,15 @@
-FROM postgres:13.4-alpine
+FROM postgres:14.12-alpine
 
 RUN apk -U --no-cache upgrade && apk add --no-cache ca-certificates
 
 # restic installation
-ARG RESTIC_URL=https://github.com/restic/restic/releases/download/v0.12.1/restic_0.12.1_linux_amd64.bz2
-ARG RESTIC=restic_0.12.1_linux_amd64
-ARG RESTIC_ARCHIVE=restic_0.12.1_linux_amd64.bz2
-ARG RESTIC_SHA256SUM=11d6ee35ec73058dae73d31d9cd17fe79661090abeb034ec6e13e3c69a4e7088
+ARG RESTIC_URL=https://github.com/restic/restic/releases/download/v0.16.5/restic_0.16.5_linux_amd64.bz2
+ARG RESTIC=restic_0.16.5_linux_amd64
+ARG RESTIC_ARCHIVE=restic_0.16.5_linux_amd64.bz2
+ARG RESTIC_SHA256SUM=f1a9c39d396d1217c05584284352f4a3bef008be5d06ce1b81a6cf88f6f3a7b1
 
-RUN wget -q "$RESTIC_URL" \
+RUN wget -q "${RESTIC_URL}" \
   && echo "${RESTIC_SHA256SUM}  ${RESTIC_ARCHIVE}" | sha256sum -c - \
   && bzip2 -d "${RESTIC_ARCHIVE}" \
-  && chmod +x "$RESTIC" \
-  && mv "$RESTIC" /usr/bin/restic
+  && chmod +x "${RESTIC}" \
+  && mv "${RESTIC}" /usr/bin/restic
diff --git a/charts/cloudsql-backup/templates/backup-check-cronjob.yaml b/charts/cloudsql-backup/templates/backup-check-cronjob.yaml
index be9bbab..8571d84 100644
--- a/charts/cloudsql-backup/templates/backup-check-cronjob.yaml
+++ b/charts/cloudsql-backup/templates/backup-check-cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range .Values.apps }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   annotations:
diff --git a/charts/cloudsql-backup/templates/backup-cleanup-cronjob.yaml b/charts/cloudsql-backup/templates/backup-cleanup-cronjob.yaml
index 4b67b90..a494882 100644
--- a/charts/cloudsql-backup/templates/backup-cleanup-cronjob.yaml
+++ b/charts/cloudsql-backup/templates/backup-cleanup-cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range .Values.apps }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   annotations:
diff --git a/charts/cloudsql-backup/templates/backup-create-cronjob.yaml b/charts/cloudsql-backup/templates/backup-create-cronjob.yaml
index d1e0d1b..c991944 100644
--- a/charts/cloudsql-backup/templates/backup-create-cronjob.yaml
+++ b/charts/cloudsql-backup/templates/backup-create-cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range .Values.apps }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   annotations:
diff --git a/charts/cloudsql-backup/templates/backup-prune-cronjob.yaml b/charts/cloudsql-backup/templates/backup-prune-cronjob.yaml
index 7901948..5034f3e 100644
--- a/charts/cloudsql-backup/templates/backup-prune-cronjob.yaml
+++ b/charts/cloudsql-backup/templates/backup-prune-cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range .Values.apps }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   annotations:
diff --git a/charts/cloudsql-backup/templates/backup-unlock-cronjob.yaml b/charts/cloudsql-backup/templates/backup-unlock-cronjob.yaml
index fa6486e..6bdd528 100644
--- a/charts/cloudsql-backup/templates/backup-unlock-cronjob.yaml
+++ b/charts/cloudsql-backup/templates/backup-unlock-cronjob.yaml
@@ -1,6 +1,6 @@
 {{- range .Values.apps }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   annotations:
diff --git a/charts/cloudsql-backup/values.yaml b/charts/cloudsql-backup/values.yaml
index fb65e85..6e2ef2f 100644
--- a/charts/cloudsql-backup/values.yaml
+++ b/charts/cloudsql-backup/values.yaml
@@ -57,5 +57,5 @@ restic:
   affinity: {}
   image:
     repository: quay.io/evl.ms/pgrestic
-    tag: 0.12.1-r0-13.4-alpine
+    tag: 0.16.5-14.12-alpine
     pullPolicy: IfNotPresent