From b7ee7e4e1ca8de0ab10ddbcc210d2ceb5fc754b7 Mon Sep 17 00:00:00 2001 From: qiuming Date: Tue, 13 Sep 2022 18:48:42 +0800 Subject: [PATCH 1/3] Fix CVE-2022-1962 by bumping up golang verison to 1.17.13 (#5286) Signed-off-by: Ming --- Dockerfile | 2 +- changelogs/unreleased/5286-qiuming-best | 1 + hack/build-image/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/5286-qiuming-best diff --git a/Dockerfile b/Dockerfile index 6c115636f..b18f45ca4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=$BUILDPLATFORM golang:1.17.11 as builder-env +FROM --platform=$BUILDPLATFORM golang:1.17.13 as builder-env ARG GOPROXY ARG PKG diff --git a/changelogs/unreleased/5286-qiuming-best b/changelogs/unreleased/5286-qiuming-best new file mode 100644 index 000000000..c1e8053e2 --- /dev/null +++ b/changelogs/unreleased/5286-qiuming-best @@ -0,0 +1 @@ +Fix CVE-2022-1962 by bumping up golang version to 1.17.13 diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 8948080d0..468074e40 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.17.11 +FROM golang:1.17.13 ARG GOPROXY From 6f5d9b030ab76775bb430702597b259e6cbc4eaf Mon Sep 17 00:00:00 2001 From: Shubham Pampattiwar Date: Tue, 13 Sep 2022 20:48:27 -0400 Subject: [PATCH 2/3] increase restic ensure repo timeout Signed-off-by: Shubham Pampattiwar add changelog Signed-off-by: Shubham Pampattiwar --- changelogs/unreleased/5336-shubham-pampattiwar | 1 + pkg/restic/repository_ensurer.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/5336-shubham-pampattiwar diff --git a/changelogs/unreleased/5336-shubham-pampattiwar b/changelogs/unreleased/5336-shubham-pampattiwar new file mode 100644 index 000000000..803f0f3cb --- /dev/null +++ b/changelogs/unreleased/5336-shubham-pampattiwar @@ -0,0 +1 @@ +Increase ensure restic repository timeout to 5m \ No newline at end of file diff --git a/pkg/restic/repository_ensurer.go b/pkg/restic/repository_ensurer.go index f1f4f168a..c86580402 100644 --- a/pkg/restic/repository_ensurer.go +++ b/pkg/restic/repository_ensurer.go @@ -176,7 +176,7 @@ func (r *repositoryEnsurer) EnsureRepo(ctx context.Context, namespace, volumeNam select { // repositories should become either ready or not ready quickly if they're // newly created. - case <-time.After(time.Minute): + case <-time.After(time.Minute * 5): return nil, errors.New("timed out waiting for restic repository to become ready") case <-ctx.Done(): return nil, errors.New("timed out waiting for restic repository to become ready") From 11dbf8c974fa7e367b58c11d8eba44813a0fa3a6 Mon Sep 17 00:00:00 2001 From: Ming Date: Wed, 14 Sep 2022 03:02:15 +0000 Subject: [PATCH 3/3] Generate changelog for v1.9.2 Signed-off-by: Ming --- changelogs/CHANGELOG-1.9.md | 25 +++++++++++++++++++ changelogs/unreleased/5286-qiuming-best | 1 - changelogs/unreleased/5300-qiuming-best | 1 - changelogs/unreleased/5301-divolgin | 1 - changelogs/unreleased/5302-sseago | 1 - changelogs/unreleased/5303-lilongfeng0902 | 1 - .../unreleased/5304-shubham-pampattiwar | 1 - .../unreleased/5336-shubham-pampattiwar | 1 - 8 files changed, 25 insertions(+), 7 deletions(-) delete mode 100644 changelogs/unreleased/5286-qiuming-best delete mode 100644 changelogs/unreleased/5300-qiuming-best delete mode 100644 changelogs/unreleased/5301-divolgin delete mode 100644 changelogs/unreleased/5302-sseago delete mode 100644 changelogs/unreleased/5303-lilongfeng0902 delete mode 100644 changelogs/unreleased/5304-shubham-pampattiwar delete mode 100644 changelogs/unreleased/5336-shubham-pampattiwar diff --git a/changelogs/CHANGELOG-1.9.md b/changelogs/CHANGELOG-1.9.md index ae72901a8..87a740925 100644 --- a/changelogs/CHANGELOG-1.9.md +++ b/changelogs/CHANGELOG-1.9.md @@ -1,3 +1,28 @@ +## v1.9.2 +### 2022-09-14 + +### Download +https://github.com/vmware-tanzu/velero/releases/tag/v1.9.2 + +### Container Image +`velero/velero:v1.9.2` + +### Documentation +https://velero.io/docs/v1.9/ + +### Upgrading +https://velero.io/docs/v1.9/upgrade-to-1.9/ + +### All changes + + * Fix CVE-2022-1962 by bumping up golang version to 1.17.13 (#5286, @qiuming-best) + * Fix code spell check fail (#5300, @qiuming-best) + * Fix nil pointer panic when restoring StatefulSets (#5301, @divolgin) + * Check for empty ns list before checking nslist[0] (#5302, @sseago) + * check vsc null pointer (#5303, @lilongfeng0902) + * Fix edge cases for already exists resources (#5304, @shubham-pampattiwar) + * Increase ensure restic repository timeout to 5m (#5336, @shubham-pampattiwar) + ## v1.9.1 ### 2022-08-03 diff --git a/changelogs/unreleased/5286-qiuming-best b/changelogs/unreleased/5286-qiuming-best deleted file mode 100644 index c1e8053e2..000000000 --- a/changelogs/unreleased/5286-qiuming-best +++ /dev/null @@ -1 +0,0 @@ -Fix CVE-2022-1962 by bumping up golang version to 1.17.13 diff --git a/changelogs/unreleased/5300-qiuming-best b/changelogs/unreleased/5300-qiuming-best deleted file mode 100644 index 2c300e68e..000000000 --- a/changelogs/unreleased/5300-qiuming-best +++ /dev/null @@ -1 +0,0 @@ -Fix code spell check fail diff --git a/changelogs/unreleased/5301-divolgin b/changelogs/unreleased/5301-divolgin deleted file mode 100644 index 7a6e24cfe..000000000 --- a/changelogs/unreleased/5301-divolgin +++ /dev/null @@ -1 +0,0 @@ -Fix nil pointer panic when restoring StatefulSets \ No newline at end of file diff --git a/changelogs/unreleased/5302-sseago b/changelogs/unreleased/5302-sseago deleted file mode 100644 index 4d295cce8..000000000 --- a/changelogs/unreleased/5302-sseago +++ /dev/null @@ -1 +0,0 @@ -Check for empty ns list before checking nslist[0] diff --git a/changelogs/unreleased/5303-lilongfeng0902 b/changelogs/unreleased/5303-lilongfeng0902 deleted file mode 100644 index 819069ac3..000000000 --- a/changelogs/unreleased/5303-lilongfeng0902 +++ /dev/null @@ -1 +0,0 @@ -check vsc null pointer \ No newline at end of file diff --git a/changelogs/unreleased/5304-shubham-pampattiwar b/changelogs/unreleased/5304-shubham-pampattiwar deleted file mode 100644 index 693e1c4fb..000000000 --- a/changelogs/unreleased/5304-shubham-pampattiwar +++ /dev/null @@ -1 +0,0 @@ -Fix edge cases for already exists resources \ No newline at end of file diff --git a/changelogs/unreleased/5336-shubham-pampattiwar b/changelogs/unreleased/5336-shubham-pampattiwar deleted file mode 100644 index 803f0f3cb..000000000 --- a/changelogs/unreleased/5336-shubham-pampattiwar +++ /dev/null @@ -1 +0,0 @@ -Increase ensure restic repository timeout to 5m \ No newline at end of file