From 6b34c163a5ed9e60b7eaaf9cab29def9df3e1296 Mon Sep 17 00:00:00 2001 From: Roi Vazquez Date: Wed, 25 Oct 2023 17:06:51 +0200 Subject: [PATCH 1/2] Set gzip compression to the minimum --- pkg/redis/backup/s3upload.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/redis/backup/s3upload.go b/pkg/redis/backup/s3upload.go index 68f3a699..cc5c97a4 100644 --- a/pkg/redis/backup/s3upload.go +++ b/pkg/redis/backup/s3upload.go @@ -59,7 +59,7 @@ func (br *Runner) UploadBackup(ctx context.Context) error { path.Dir(br.RedisDBFile), br.BackupFile(), ), // gzip /data/redis-backup---.rdb - fmt.Sprintf("gzip %s/%s", path.Dir(br.RedisDBFile), br.BackupFile()), + fmt.Sprintf("gzip -1 %s/%s", path.Dir(br.RedisDBFile), br.BackupFile()), // AWS_ACCESS_KEY_ID=*** AWS_SECRET_ACCESS_KEY=*** s3cmd put /data/redis-backup---.rdb s3:////redis-backup---.rdb fmt.Sprintf("%s=%s %s=%s %s=%s %s s3 cp --only-show-errors %s/%s s3://%s/%s/%s", util.AWSRegionEnvvar, br.AWSRegion, From adc7efa3ff0c48d3d17cfe1a8063438f54f51c30 Mon Sep 17 00:00:00 2001 From: Roi Vazquez Date: Wed, 25 Oct 2023 17:22:51 +0200 Subject: [PATCH 2/2] Release v0.20.1 --- Makefile | 2 +- bundle/manifests/saas-operator.clusterserviceversion.yaml | 8 ++++---- config/manager/kustomization.yaml | 2 +- pkg/version/version.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7cf598db..051b4ee6 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -VERSION ?= 0.20.0 +VERSION ?= 0.20.1 # CHANNELS define the bundle channels used in the bundle. # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable") diff --git a/bundle/manifests/saas-operator.clusterserviceversion.yaml b/bundle/manifests/saas-operator.clusterserviceversion.yaml index 1edf54f9..949db9b7 100644 --- a/bundle/manifests/saas-operator.clusterserviceversion.yaml +++ b/bundle/manifests/saas-operator.clusterserviceversion.yaml @@ -657,7 +657,7 @@ metadata: capabilities: Basic Install categories: Integration & Delivery containerImage: quay.io/3scale/saas-operator - createdAt: "2023-10-16T08:57:47Z" + createdAt: "2023-10-25T15:22:33Z" description: |- The 3scale SaaS Operator creates and maintains a SaaS-ready deployment of the Red Hat 3scale API Management on OpenShift. @@ -665,7 +665,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/3scale/saas-operator support: Red Hat - name: saas-operator.v0.20.0 + name: saas-operator.v0.20.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -4540,7 +4540,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/3scale/saas-operator:v0.20.0 + image: quay.io/3scale/saas-operator:v0.20.1 livenessProbe: httpGet: path: /healthz @@ -5104,4 +5104,4 @@ spec: provider: name: Red Hat url: https://www.3scale.net/ - version: 0.20.0 + version: 0.20.1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 314bbc65..1d14b242 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: quay.io/3scale/saas-operator - newTag: v0.20.0 + newTag: v0.20.1 diff --git a/pkg/version/version.go b/pkg/version/version.go index eb912bf9..62f767c0 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -1,7 +1,7 @@ package version const ( - version string = "v0.20.0" + version string = "v0.20.1" ) // Current returns the current marin3r operator version