Merge branch 'release-1.9' into issue-4980

This commit is contained in:
qiuming
2022-09-14 15:27:25 +08:00
committed by GitHub
9 changed files with 28 additions and 8 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -1 +0,0 @@
Fix code spell check fail

View File

@@ -1 +0,0 @@
Fix nil pointer panic when restoring StatefulSets

View File

@@ -1 +0,0 @@
Check for empty ns list before checking nslist[0]

View File

@@ -1 +0,0 @@
check vsc null pointer

View File

@@ -1 +0,0 @@
Fix edge cases for already exists resources

View File

@@ -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

View File

@@ -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")