From e92454328fa5b95e36c6f027b8fa0ae19acbb67a Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Mon, 30 Dec 2024 04:57:49 -0800 Subject: [PATCH] Fix postgres-restic-plugin version Signed-off-by: Tamal Saha --- catalog/copy-images.sh | 1 - catalog/export-images.sh | 1 - catalog/imagelist.yaml | 1 - catalog/import-images.sh | 1 - catalog/import-into-k3s.sh | 1 - .../raw/postgres/postgres-physical-backup-restore-function.yaml | 2 +- catalog/scripts/operator/copy-images.sh | 1 - catalog/scripts/operator/export-images.sh | 1 - catalog/scripts/operator/imagelist.yaml | 1 - catalog/scripts/operator/import-images.sh | 1 - catalog/scripts/operator/import-into-k3s.sh | 1 - .../templates/postgres/postgres-physical-backup-restore.yaml | 2 +- 12 files changed, 2 insertions(+), 12 deletions(-) diff --git a/catalog/copy-images.sh b/catalog/copy-images.sh index 722390afa..9c35758e9 100755 --- a/catalog/copy-images.sh +++ b/catalog/copy-images.sh @@ -324,7 +324,6 @@ $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-ar $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-archiver:v0.11.0_17.2-bookworm $IMAGE_REGISTRY/kubedb/postgres-archiver:v0.11.0_17.2-bookworm $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-csi-snapshotter-plugin:v0.11.0 $IMAGE_REGISTRY/kubedb/postgres-csi-snapshotter-plugin:v0.11.0 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-init:0.17.0 $IMAGE_REGISTRY/kubedb/postgres-init:0.17.0 -$CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-restic-plugin:v0.13.0_17.2 $IMAGE_REGISTRY/kubedb/postgres-restic-plugin:v0.13.0_17.2 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-aws:v0.12.0 $IMAGE_REGISTRY/kubedb/provider-aws:v0.12.0 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-azure:v0.12.0 $IMAGE_REGISTRY/kubedb/provider-azure:v0.12.0 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-gcp:v0.12.0 $IMAGE_REGISTRY/kubedb/provider-gcp:v0.12.0 diff --git a/catalog/export-images.sh b/catalog/export-images.sh index 7be562f1c..9f47b6bb3 100755 --- a/catalog/export-images.sh +++ b/catalog/export-images.sh @@ -321,7 +321,6 @@ $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres- $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-archiver:v0.11.0_17.2-bookworm images/kubedb-postgres-archiver-v0.11.0_17.2-bookworm.tar $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-csi-snapshotter-plugin:v0.11.0 images/kubedb-postgres-csi-snapshotter-plugin-v0.11.0.tar $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-init:0.17.0 images/kubedb-postgres-init-0.17.0.tar -$CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-restic-plugin:v0.13.0_17.2 images/kubedb-postgres-restic-plugin-v0.13.0_17.2.tar $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-aws:v0.12.0 images/kubedb-provider-aws-v0.12.0.tar $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-azure:v0.12.0 images/kubedb-provider-azure-v0.12.0.tar $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-gcp:v0.12.0 images/kubedb-provider-gcp-v0.12.0.tar diff --git a/catalog/imagelist.yaml b/catalog/imagelist.yaml index b9aaa3a4c..d2795adc4 100644 --- a/catalog/imagelist.yaml +++ b/catalog/imagelist.yaml @@ -287,7 +287,6 @@ - ghcr.io/kubedb/postgres-archiver:v0.11.0_17.2-bookworm - ghcr.io/kubedb/postgres-csi-snapshotter-plugin:v0.11.0 - ghcr.io/kubedb/postgres-init:0.17.0 -- ghcr.io/kubedb/postgres-restic-plugin:v0.13.0_17.2 - ghcr.io/kubedb/provider-aws:v0.12.0 - ghcr.io/kubedb/provider-azure:v0.12.0 - ghcr.io/kubedb/provider-gcp:v0.12.0 diff --git a/catalog/import-images.sh b/catalog/import-images.sh index d24b97291..4e466de63 100755 --- a/catalog/import-images.sh +++ b/catalog/import-images.sh @@ -315,7 +315,6 @@ $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-postgres-a $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-postgres-archiver-v0.11.0_17.2-bookworm.tar $IMAGE_REGISTRY/kubedb/postgres-archiver:v0.11.0_17.2-bookworm $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-postgres-csi-snapshotter-plugin-v0.11.0.tar $IMAGE_REGISTRY/kubedb/postgres-csi-snapshotter-plugin:v0.11.0 $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-postgres-init-0.17.0.tar $IMAGE_REGISTRY/kubedb/postgres-init:0.17.0 -$CMD push --allow-nondistributable-artifacts --insecure images/kubedb-postgres-restic-plugin-v0.13.0_17.2.tar $IMAGE_REGISTRY/kubedb/postgres-restic-plugin:v0.13.0_17.2 $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-provider-aws-v0.12.0.tar $IMAGE_REGISTRY/kubedb/provider-aws:v0.12.0 $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-provider-azure-v0.12.0.tar $IMAGE_REGISTRY/kubedb/provider-azure:v0.12.0 $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-provider-gcp-v0.12.0.tar $IMAGE_REGISTRY/kubedb/provider-gcp:v0.12.0 diff --git a/catalog/import-into-k3s.sh b/catalog/import-into-k3s.sh index b57fe846f..f5685a413 100755 --- a/catalog/import-into-k3s.sh +++ b/catalog/import-into-k3s.sh @@ -313,7 +313,6 @@ k3s ctr images import images/kubedb-postgres-archiver-v0.11.0_17.2-alpine.tar k3s ctr images import images/kubedb-postgres-archiver-v0.11.0_17.2-bookworm.tar k3s ctr images import images/kubedb-postgres-csi-snapshotter-plugin-v0.11.0.tar k3s ctr images import images/kubedb-postgres-init-0.17.0.tar -k3s ctr images import images/kubedb-postgres-restic-plugin-v0.13.0_17.2.tar k3s ctr images import images/kubedb-provider-aws-v0.12.0.tar k3s ctr images import images/kubedb-provider-azure-v0.12.0.tar k3s ctr images import images/kubedb-provider-gcp-v0.12.0.tar diff --git a/catalog/kubestash/raw/postgres/postgres-physical-backup-restore-function.yaml b/catalog/kubestash/raw/postgres/postgres-physical-backup-restore-function.yaml index 53459c49e..a1412e0f3 100644 --- a/catalog/kubestash/raw/postgres/postgres-physical-backup-restore-function.yaml +++ b/catalog/kubestash/raw/postgres/postgres-physical-backup-restore-function.yaml @@ -15,4 +15,4 @@ spec: - --user=${user:=} - --restore-cmd=${restoreCmd:=} - --restore-path=${restorePath:=} - image: ghcr.io/kubedb/postgres-restic-plugin:v0.13.0_17.2 + image: ghcr.io/kubedb/postgres-restic-plugin:v0.13.0_${DB_VERSION} diff --git a/catalog/scripts/operator/copy-images.sh b/catalog/scripts/operator/copy-images.sh index 5bf46f14f..7b6adab2e 100755 --- a/catalog/scripts/operator/copy-images.sh +++ b/catalog/scripts/operator/copy-images.sh @@ -58,7 +58,6 @@ $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/mongodb-csi $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/mssqlserver-walg-plugin:v0.0.1 $IMAGE_REGISTRY/kubedb/mssqlserver-walg-plugin:v0.0.1 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/mysql-csi-snapshotter-plugin:v0.11.0 $IMAGE_REGISTRY/kubedb/mysql-csi-snapshotter-plugin:v0.11.0 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-csi-snapshotter-plugin:v0.11.0 $IMAGE_REGISTRY/kubedb/postgres-csi-snapshotter-plugin:v0.11.0 -$CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-restic-plugin:v0.13.0_17.2 $IMAGE_REGISTRY/kubedb/postgres-restic-plugin:v0.13.0_17.2 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-aws:v0.12.0 $IMAGE_REGISTRY/kubedb/provider-aws:v0.12.0 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-azure:v0.12.0 $IMAGE_REGISTRY/kubedb/provider-azure:v0.12.0 $CMD cp --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-gcp:v0.12.0 $IMAGE_REGISTRY/kubedb/provider-gcp:v0.12.0 diff --git a/catalog/scripts/operator/export-images.sh b/catalog/scripts/operator/export-images.sh index aa5446639..c893c4db1 100755 --- a/catalog/scripts/operator/export-images.sh +++ b/catalog/scripts/operator/export-images.sh @@ -55,7 +55,6 @@ $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/mongodb-c $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/mssqlserver-walg-plugin:v0.0.1 images/kubedb-mssqlserver-walg-plugin-v0.0.1.tar $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/mysql-csi-snapshotter-plugin:v0.11.0 images/kubedb-mysql-csi-snapshotter-plugin-v0.11.0.tar $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-csi-snapshotter-plugin:v0.11.0 images/kubedb-postgres-csi-snapshotter-plugin-v0.11.0.tar -$CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/postgres-restic-plugin:v0.13.0_17.2 images/kubedb-postgres-restic-plugin-v0.13.0_17.2.tar $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-aws:v0.12.0 images/kubedb-provider-aws-v0.12.0.tar $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-azure:v0.12.0 images/kubedb-provider-azure-v0.12.0.tar $CMD pull --allow-nondistributable-artifacts --insecure ghcr.io/kubedb/provider-gcp:v0.12.0 images/kubedb-provider-gcp-v0.12.0.tar diff --git a/catalog/scripts/operator/imagelist.yaml b/catalog/scripts/operator/imagelist.yaml index c7d1e9f0c..d0e4c40fe 100644 --- a/catalog/scripts/operator/imagelist.yaml +++ b/catalog/scripts/operator/imagelist.yaml @@ -21,7 +21,6 @@ - ghcr.io/kubedb/mssqlserver-walg-plugin:v0.0.1 - ghcr.io/kubedb/mysql-csi-snapshotter-plugin:v0.11.0 - ghcr.io/kubedb/postgres-csi-snapshotter-plugin:v0.11.0 -- ghcr.io/kubedb/postgres-restic-plugin:v0.13.0_17.2 - ghcr.io/kubedb/provider-aws:v0.12.0 - ghcr.io/kubedb/provider-azure:v0.12.0 - ghcr.io/kubedb/provider-gcp:v0.12.0 diff --git a/catalog/scripts/operator/import-images.sh b/catalog/scripts/operator/import-images.sh index c403a5d61..a88677590 100755 --- a/catalog/scripts/operator/import-images.sh +++ b/catalog/scripts/operator/import-images.sh @@ -49,7 +49,6 @@ $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-mongodb-cs $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-mssqlserver-walg-plugin-v0.0.1.tar $IMAGE_REGISTRY/kubedb/mssqlserver-walg-plugin:v0.0.1 $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-mysql-csi-snapshotter-plugin-v0.11.0.tar $IMAGE_REGISTRY/kubedb/mysql-csi-snapshotter-plugin:v0.11.0 $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-postgres-csi-snapshotter-plugin-v0.11.0.tar $IMAGE_REGISTRY/kubedb/postgres-csi-snapshotter-plugin:v0.11.0 -$CMD push --allow-nondistributable-artifacts --insecure images/kubedb-postgres-restic-plugin-v0.13.0_17.2.tar $IMAGE_REGISTRY/kubedb/postgres-restic-plugin:v0.13.0_17.2 $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-provider-aws-v0.12.0.tar $IMAGE_REGISTRY/kubedb/provider-aws:v0.12.0 $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-provider-azure-v0.12.0.tar $IMAGE_REGISTRY/kubedb/provider-azure:v0.12.0 $CMD push --allow-nondistributable-artifacts --insecure images/kubedb-provider-gcp-v0.12.0.tar $IMAGE_REGISTRY/kubedb/provider-gcp:v0.12.0 diff --git a/catalog/scripts/operator/import-into-k3s.sh b/catalog/scripts/operator/import-into-k3s.sh index c1e7ed3dc..1d86b5cd1 100755 --- a/catalog/scripts/operator/import-into-k3s.sh +++ b/catalog/scripts/operator/import-into-k3s.sh @@ -47,7 +47,6 @@ k3s ctr images import images/kubedb-mongodb-csi-snapshotter-plugin-v0.11.0.tar k3s ctr images import images/kubedb-mssqlserver-walg-plugin-v0.0.1.tar k3s ctr images import images/kubedb-mysql-csi-snapshotter-plugin-v0.11.0.tar k3s ctr images import images/kubedb-postgres-csi-snapshotter-plugin-v0.11.0.tar -k3s ctr images import images/kubedb-postgres-restic-plugin-v0.13.0_17.2.tar k3s ctr images import images/kubedb-provider-aws-v0.12.0.tar k3s ctr images import images/kubedb-provider-azure-v0.12.0.tar k3s ctr images import images/kubedb-provider-gcp-v0.12.0.tar diff --git a/charts/kubedb-kubestash-catalog/templates/postgres/postgres-physical-backup-restore.yaml b/charts/kubedb-kubestash-catalog/templates/postgres/postgres-physical-backup-restore.yaml index ad4d127c3..f9653012c 100644 --- a/charts/kubedb-kubestash-catalog/templates/postgres/postgres-physical-backup-restore.yaml +++ b/charts/kubedb-kubestash-catalog/templates/postgres/postgres-physical-backup-restore.yaml @@ -23,5 +23,5 @@ spec: - --user=${user:=} - --restore-cmd=${restoreCmd:=} - --restore-path=${restorePath:=} - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/postgres-restic-plugin") $) }}:v0.13.0_17.2' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/postgres-restic-plugin") $) }}:v0.13.0_${DB_VERSION}' {{ end }}