Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bump golang dependencies #5917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 8, 2022
+222,192 −34,937
Merged

Bump golang dependencies #5917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ check-config-template:
./hack/validate-config.sh

shellfiles: ${SHFMT}
$(eval SHELLFILES=$(shell ${SHFMT} -f . | grep -v vendor/ | grep -v hack/lib | grep -v hack/build-rpms.sh))
$(eval SHELLFILES=$(shell ${SHFMT} -f . | grep -v vendor/ | grep -v hack/lib | grep -v hack/build-rpms.sh | grep -v .bats))

shfmt: shellfiles
${SHFMT} -ln bash -w -i 4 -d ${SHELLFILES}
Expand Down
238 changes: 128 additions & 110 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

771 changes: 585 additions & 186 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions internal/config/cgmgr/cgroupfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"strings"

"github.com/containers/podman/v3/pkg/cgroups"
"github.com/containers/podman/v3/pkg/rootless"
"github.com/cri-o/cri-o/internal/config/node"
"github.com/cri-o/cri-o/utils"
libctr "github.com/opencontainers/runc/libcontainer/cgroups"
Expand Down Expand Up @@ -135,7 +134,7 @@ func (*CgroupfsManager) MoveConmonToCgroup(cid, cgroupParent, conmonCgroup strin
return cgroupPath, nil
}

func setWorkloadSettings(cgPath string, resources *rspec.LinuxResources) error {
func setWorkloadSettings(cgPath string, resources *rspec.LinuxResources) (err error) {
var mgr libctr.Manager
if resources.CPU == nil {
return nil
Expand Down Expand Up @@ -169,13 +168,12 @@ func setWorkloadSettings(cgPath string, resources *rspec.LinuxResources) error {
}

if node.CgroupIsV2() {
var err error
mgr, err = fs2.NewManager(cg, cgPath, rootless.IsRootless())
if err != nil {
return err
}
mgr, err = fs2.NewManager(cg, cgPath)
} else {
mgr = fs.NewManager(cg, paths, rootless.IsRootless())
mgr, err = fs.NewManager(cg, paths)
}
if err != nil {
return err
}
return mgr.Set(cg.Resources)
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/dependencies/dependencies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"k8s.io/release/pkg/git"
"sigs.k8s.io/release-sdk/git"
"sigs.k8s.io/release-utils/command"
)

Expand Down
2 changes: 1 addition & 1 deletion scripts/release-branch-forward/release_branch_forward.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/pkg/errors"
"github.com/sirupsen/logrus"
kgit "k8s.io/release/pkg/git"
kgit "sigs.k8s.io/release-sdk/git"
"sigs.k8s.io/release-utils/command"
"sigs.k8s.io/release-utils/env"
)
Expand Down
4 changes: 2 additions & 2 deletions scripts/release-notes/release_notes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/cri-o/cri-o/internal/version"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"k8s.io/release/pkg/git"
"sigs.k8s.io/release-sdk/git"
"sigs.k8s.io/release-utils/command"
"sigs.k8s.io/release-utils/util"
)
Expand Down Expand Up @@ -229,7 +229,7 @@ Download one of our static release bundles via our Google Cloud Bucket:
}

// Other jobs could run in parallel, rebase before pushing
if err := repo.FetchRemote(git.DefaultRemote); err != nil {
if _, err := repo.FetchRemote(git.DefaultRemote); err != nil {
return errors.Wrap(err, "fetch remote")
}

Expand Down
4 changes: 2 additions & 2 deletions scripts/release/release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/blang/semver"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"k8s.io/release/pkg/git"
"k8s.io/release/pkg/github"
"sigs.k8s.io/release-sdk/git"
"sigs.k8s.io/release-sdk/github"
"sigs.k8s.io/release-utils/command"
"sigs.k8s.io/release-utils/env"
"sigs.k8s.io/release-utils/util"
Expand Down
115 changes: 76 additions & 39 deletions vendor/github.com/Microsoft/go-winio/backuptar/tar.go
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions vendor/github.com/Microsoft/go-winio/file.go
View file
Open in desktop

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

17 changes: 13 additions & 4 deletions vendor/github.com/Microsoft/go-winio/hvsock.go
View file
Open in desktop

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

9 changes: 0 additions & 9 deletions vendor/github.com/Microsoft/go-winio/pkg/guid/guid.go
View file
Open in desktop

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

15 changes: 15 additions & 0 deletions vendor/github.com/Microsoft/go-winio/pkg/guid/guid_nonwindows.go
View file
Open in desktop

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

10 changes: 10 additions & 0 deletions vendor/github.com/Microsoft/go-winio/pkg/guid/guid_windows.go
View file
Open in desktop

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

Loading