Skip to content

Commit

Permalink
Merge pull request #150 from blackpiglet/release-0.3
Browse files Browse the repository at this point in the history
Bump up Golang version and gopkg.in/yaml.v3 version.
  • Loading branch information
qiuming-best authored Feb 21, 2023
2 parents ef72d98 + 15cdeef commit 43080a7
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 34 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.18.8
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18.8
go-version: 1.18.10
id: go

- name: Check out the code
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.18.8
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18.8
go-version: 1.18.10
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# The binary to build (just the basename).
BIN ?= velero-plugin-for-csi

BUILD_IMAGE ?= golang:1.18.8-bullseye
BUILD_IMAGE ?= golang:1.18.10-bullseye

REGISTRY ?= velero
IMAGE_NAME ?= $(REGISTRY)/velero-plugin-for-csi
Expand Down
4 changes: 4 additions & 0 deletions changelogs/CHANGELOG-0.3.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
## All changes

* Bump up Golang version and gopkg.in/yaml.v3 version. (#150, @blackpiglet)
* Update golang.org/x/net version to address CVE-2022-41721. (#146, @blackpiglet)
1 change: 0 additions & 1 deletion changelogs/unreleased/146-blackpiglet

This file was deleted.

19 changes: 6 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ require (
github.com/oklog/run v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/cobra v1.2.1 // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect
Expand All @@ -71,7 +71,7 @@ require (
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.22.2 // indirect
k8s.io/klog/v2 v2.9.0 // indirect
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
Expand All @@ -80,10 +80,3 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b
golang.org/x/net => golang.org/x/net v0.1.1-0.20221104162952-702349b0e862
golang.org/x/text => golang.org/x/text v0.3.8
)
106 changes: 91 additions & 15 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit 43080a7

Please sign in to comment.