From 653e0a5ebec4106214462bbb6febbb3189533d6c Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Thu, 9 May 2024 11:46:16 +0200 Subject: [PATCH 1/8] fix pmm version --- e2e-tests/functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e2e-tests/functions b/e2e-tests/functions index 2e2f74656a..6dc4113a73 100755 --- a/e2e-tests/functions +++ b/e2e-tests/functions @@ -1480,7 +1480,8 @@ function prepare_cr_yaml() { .spec.backup.storages.minio.s3.region = \"us-east-1\" | .spec.backup.storages.minio.s3.bucket = \"operator-testing\" | .spec.backup.storages.minio.s3.endpointUrl = \"http://minio-service.#namespace:9000/\" | - .spec.backup.storages.minio.type = \"s3\" + .spec.backup.storages.minio.type = \"s3\" | + .spec.pmm.image = \"-pmm\" " - >"${cr_yaml}" if [[ ${proxy} == "haproxy" ]]; then yq -i eval ' From 05202ecf98ca2f18c35c18da271fde2f0e641b09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:00:12 +0200 Subject: [PATCH 2/8] CLOUD-727: Bump github.com/minio/minio-go/v7 from 7.0.77 to 7.0.80 (#1857) Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.77 to 7.0.80. - [Release notes](https://github.com/minio/minio-go/releases) - [Commits](https://github.com/minio/minio-go/compare/v7.0.77...v7.0.80) --- updated-dependencies: - dependency-name: github.com/minio/minio-go/v7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 4a817059b2..6b49da38ea 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/go-sql-driver/mysql v1.8.1 github.com/google/go-cmp v0.6.0 github.com/hashicorp/go-version v1.7.0 - github.com/minio/minio-go/v7 v7.0.77 + github.com/minio/minio-go/v7 v7.0.80 github.com/onsi/ginkgo/v2 v2.21.0 github.com/onsi/gomega v1.35.1 github.com/pkg/errors v0.9.1 @@ -65,7 +65,7 @@ require ( github.com/imdario/mergo v0.3.16 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/minio/md5-simd v1.1.2 // indirect diff --git a/go.sum b/go.sum index 7ed984c2b6..157a03768d 100644 --- a/go.sum +++ b/go.sum @@ -111,8 +111,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -126,8 +126,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= -github.com/minio/minio-go/v7 v7.0.77 h1:GaGghJRg9nwDVlNbwYjSDJT1rqltQkBFDsypWX1v3Bw= -github.com/minio/minio-go/v7 v7.0.77/go.mod h1:AVM3IUN6WwKzmwBxVdjzhH8xq+f57JSbbvzqvUzR6eg= +github.com/minio/minio-go/v7 v7.0.80 h1:2mdUHXEykRdY/BigLt3Iuu1otL0JTogT0Nmltg0wujk= +github.com/minio/minio-go/v7 v7.0.80/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8= From b06c7831f13726a5e00ed9f32e9f1cfe25db75ae Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Mon, 18 Nov 2024 13:10:28 +0100 Subject: [PATCH 3/8] fix trivy --- .github/workflows/scan.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 8e190c7351..cc63789828 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -39,6 +39,7 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' + version: v0.57.1 - name: Build an image from Dockerfile (linux/amd64) run: | @@ -57,3 +58,4 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' + version: v0.57.1 From 64bcbb5e7e84c7ee180d54f92162af2015cbd698 Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Mon, 18 Nov 2024 13:14:11 +0100 Subject: [PATCH 4/8] fix trivy --- .github/workflows/scan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index cc63789828..f40866f6e5 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -39,7 +39,7 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - version: v0.57.1 + version: 0.57.1 - name: Build an image from Dockerfile (linux/amd64) run: | @@ -58,4 +58,4 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - version: v0.57.1 + version: 0.57.1 From b80530f7a0ff9aafafb7c5c3c1c8fece2d76b704 Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Mon, 18 Nov 2024 13:33:05 +0100 Subject: [PATCH 5/8] fix trivy --- .github/workflows/scan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index f40866f6e5..03d8cb0385 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -39,7 +39,7 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - version: 0.57.1 + version: 0.57.0 - name: Build an image from Dockerfile (linux/amd64) run: | @@ -58,4 +58,4 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - version: 0.57.1 + version: 0.57.0 From 93a633d7715e573bb13c317d38bc3e55bf804ac7 Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Mon, 18 Nov 2024 13:40:57 +0100 Subject: [PATCH 6/8] fix trivy --- .github/workflows/scan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 03d8cb0385..879de3b8fd 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -39,7 +39,7 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - version: 0.57.0 + version: v0.57.0 - name: Build an image from Dockerfile (linux/amd64) run: | @@ -58,4 +58,4 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - version: 0.57.0 + version: v0.57.0 From 6a2620ea4130ce0e22fdfbac11112b0174172684 Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Mon, 18 Nov 2024 13:42:08 +0100 Subject: [PATCH 7/8] fix trivy --- .github/workflows/scan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 879de3b8fd..8a1be5ccaa 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -39,7 +39,7 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - version: v0.57.0 + version: 'v0.57.0' - name: Build an image from Dockerfile (linux/amd64) run: | @@ -58,4 +58,4 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - version: v0.57.0 + version: 'v0.57.0' From 86008ed70717ed3a90a06d3820a59770df9ef263 Mon Sep 17 00:00:00 2001 From: Natalia Marukovich Date: Mon, 18 Nov 2024 13:48:26 +0100 Subject: [PATCH 8/8] fix trivy --- .github/workflows/scan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 8a1be5ccaa..d179f5fffd 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -39,7 +39,7 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - version: 'v0.57.0' + version: 'v0.57.1' - name: Build an image from Dockerfile (linux/amd64) run: | @@ -58,4 +58,4 @@ jobs: ignore-unfixed: true vuln-type: 'os,library' severity: 'CRITICAL,HIGH' - version: 'v0.57.0' + version: 'v0.57.1'