Skip to content

Commit

Permalink
Merge branch 'master' into structurelogging
Browse files Browse the repository at this point in the history
  • Loading branch information
Kartik Sharma authored Dec 19, 2022
2 parents cc85cbe + b9363f2 commit 817e991
Show file tree
Hide file tree
Showing 13 changed files with 333 additions and 149 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install go
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.19

- name: Build an image from Dockerfile
run: |
Expand Down
14 changes: 8 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kubernetes-csi/livenessprobe

go 1.18
go 1.19

require (
github.com/container-storage-interface/spec v1.6.0
Expand Down Expand Up @@ -32,11 +32,13 @@ require (
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
golang.org/x/net v0.1.1-0.20221027164007-c63010009c80 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
google.golang.org/genproto v0.0.0-20220804142021-4e6b2dfa6612 // indirect
google.golang.org/protobuf v1.28.1 // indirect
k8s.io/apimachinery v0.26.0-rc.0 // indirect
k8s.io/component-base v0.26.0-rc.0 // indirect
k8s.io/apimachinery v0.26.0 // indirect
k8s.io/component-base v0.26.0 // indirect
)

replace golang.org/x/net => golang.org/x/net v0.4.0
80 changes: 16 additions & 64 deletions go.sum

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions vendor/golang.org/x/net/http2/headermap.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/golang.org/x/net/http2/hpack/encode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 817e991

Please sign in to comment.