Skip to content
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

Jump to bottom

feat(upgrade): upgrade wharfie Go dep to v0.6.8 (backport #890) #893

Merged
merged 1 commit into from
Dec 18, 2024
Merged

feat(upgrade): upgrade wharfie Go dep to v0.6.8 (backport #890) #893

merged 1 commit into from
Dec 18, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 3, 2024

Problem:

Relates to #887, but now bump Wharfie's Go dependency version to v0.6.8. Other updates are due consequences of go mod tidy and go mod vendor.

Solution:

Related Issue:

Test plan:

This is an automatic backport of pull request #890 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Dec 3, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Dec 3, 2024

Cherry-pick of 03b3616 has failed:

On branch mergify/bp/v1.3/pr-890
Your branch is up to date with 'origin/v1.3'.

You are currently cherry-picking commit 03b3616.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   go.sum
	renamed:    vendor/github.com/docker/docker/LICENSE -> vendor/github.com/containerd/stargz-snapshotter/estargz/LICENSE
	new file:   vendor/github.com/containerd/stargz-snapshotter/estargz/build.go
	new file:   vendor/github.com/containerd/stargz-snapshotter/estargz/errorutil/errors.go
	new file:   vendor/github.com/containerd/stargz-snapshotter/estargz/estargz.go
	new file:   vendor/github.com/containerd/stargz-snapshotter/estargz/gzip.go
	new file:   vendor/github.com/containerd/stargz-snapshotter/estargz/testutil.go
	new file:   vendor/github.com/containerd/stargz-snapshotter/estargz/types.go
	modified:   vendor/github.com/docker/cli/AUTHORS
	modified:   vendor/github.com/docker/cli/NOTICE
	modified:   vendor/github.com/docker/cli/cli/config/config.go
	modified:   vendor/github.com/docker/cli/cli/config/configfile/file.go
	modified:   vendor/github.com/docker/cli/cli/config/configfile/file_unix.go
	modified:   vendor/github.com/docker/cli/cli/config/credentials/default_store.go
	modified:   vendor/github.com/docker/cli/cli/config/credentials/default_store_unsupported.go
	modified:   vendor/github.com/docker/cli/cli/config/credentials/file_store.go
	modified:   vendor/github.com/docker/cli/cli/config/credentials/native_store.go
	deleted:    vendor/github.com/docker/docker/AUTHORS
	deleted:    vendor/github.com/docker/docker/NOTICE
	deleted:    vendor/github.com/docker/docker/pkg/homedir/homedir_linux.go
	deleted:    vendor/github.com/docker/docker/pkg/homedir/homedir_others.go
	deleted:    vendor/github.com/docker/docker/pkg/homedir/homedir_unix.go
	deleted:    vendor/github.com/docker/docker/pkg/homedir/homedir_windows.go
	new file:   vendor/github.com/fsnotify/fsnotify/.cirrus.yml
	modified:   vendor/github.com/fsnotify/fsnotify/.gitignore
	modified:   vendor/github.com/fsnotify/fsnotify/CHANGELOG.md
	modified:   vendor/github.com/fsnotify/fsnotify/README.md
	modified:   vendor/github.com/fsnotify/fsnotify/backend_fen.go
	modified:   vendor/github.com/fsnotify/fsnotify/backend_inotify.go
	modified:   vendor/github.com/fsnotify/fsnotify/backend_kqueue.go
	modified:   vendor/github.com/fsnotify/fsnotify/backend_other.go
	modified:   vendor/github.com/fsnotify/fsnotify/backend_windows.go
	modified:   vendor/github.com/fsnotify/fsnotify/fsnotify.go
	modified:   vendor/github.com/fsnotify/fsnotify/mkdoc.zsh
	new file:   vendor/github.com/google/go-containerregistry/internal/estargz/estargz.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/authn/authn.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/authn/keychain.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/authn/multikeychain.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/name/digest.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/name/registry.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/config.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/empty/README.md
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/empty/doc.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/empty/image.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/empty/index.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/hash.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/manifest.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/mutate/README.md
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/mutate/doc.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/mutate/image.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/mutate/index.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/mutate/mutate.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/mutate/rebase.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/partial/index.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/partial/with.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/platform.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/catalog.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/delete.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/descriptor.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/fetcher.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/image.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/index.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/layer.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/list.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/multi_write.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/options.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/progress.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/puller.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/pusher.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/referrers.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/schema1.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/transport/basic.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/transport/bearer.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/transport/error.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/transport/ping.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/transport/retry.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/transport/schemer.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/transport/transport.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/remote/write.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/stream/layer.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/tarball/README.md
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/tarball/doc.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/tarball/image.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/tarball/layer.go
	new file:   vendor/github.com/google/go-containerregistry/pkg/v1/tarball/write.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/types/types.go
	modified:   vendor/github.com/google/go-containerregistry/pkg/v1/zz_deepcopy_generated.go
	modified:   vendor/github.com/klauspost/compress/.goreleaser.yml
	modified:   vendor/github.com/klauspost/compress/README.md
	modified:   vendor/github.com/klauspost/compress/fse/compress.go
	modified:   vendor/github.com/klauspost/compress/fse/decompress.go
	modified:   vendor/github.com/klauspost/compress/huff0/bitreader.go
	modified:   vendor/github.com/klauspost/compress/huff0/bitwriter.go
	modified:   vendor/github.com/klauspost/compress/huff0/compress.go
	modified:   vendor/github.com/klauspost/compress/huff0/decompress.go
	modified:   vendor/github.com/klauspost/compress/huff0/decompress_amd64.s
	modified:   vendor/github.com/klauspost/compress/internal/snapref/encode_other.go
	modified:   vendor/github.com/klauspost/compress/zstd/blockdec.go
	modified:   vendor/github.com/klauspost/compress/zstd/blockenc.go
	modified:   vendor/github.com/klauspost/compress/zstd/bytebuf.go
	modified:   vendor/github.com/klauspost/compress/zstd/decodeheader.go
	modified:   vendor/github.com/klauspost/compress/zstd/decoder.go
	modified:   vendor/github.com/klauspost/compress/zstd/decoder_options.go
	modified:   vendor/github.com/klauspost/compress/zstd/dict.go
	modified:   vendor/github.com/klauspost/compress/zstd/enc_base.go
	modified:   vendor/github.com/klauspost/compress/zstd/enc_best.go
	modified:   vendor/github.com/klauspost/compress/zstd/enc_better.go
	modified:   vendor/github.com/klauspost/compress/zstd/enc_dfast.go
	modified:   vendor/github.com/klauspost/compress/zstd/enc_fast.go
	modified:   vendor/github.com/klauspost/compress/zstd/encoder.go
	modified:   vendor/github.com/klauspost/compress/zstd/encoder_options.go
	modified:   vendor/github.com/klauspost/compress/zstd/framedec.go
	modified:   vendor/github.com/klauspost/compress/zstd/internal/xxhash/README.md
	modified:   vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash.go
	modified:   vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_amd64.s
	modified:   vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_arm64.s
	modified:   vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_asm.go
	modified:   vendor/github.com/klauspost/compress/zstd/internal/xxhash/xxhash_other.go
	modified:   vendor/github.com/klauspost/compress/zstd/seqdec.go
	modified:   vendor/github.com/klauspost/compress/zstd/seqdec_amd64.go
	modified:   vendor/github.com/klauspost/compress/zstd/seqdec_amd64.s
	modified:   vendor/github.com/klauspost/compress/zstd/zstd.go
	modified:   vendor/github.com/opencontainers/image-spec/specs-go/v1/annotations.go
	deleted:    vendor/github.com/opencontainers/image-spec/specs-go/v1/artifact.go
	modified:   vendor/github.com/opencontainers/image-spec/specs-go/v1/config.go
	modified:   vendor/github.com/opencontainers/image-spec/specs-go/v1/manifest.go
	modified:   vendor/github.com/opencontainers/image-spec/specs-go/v1/mediatype.go
	modified:   vendor/github.com/opencontainers/image-spec/specs-go/version.go
	modified:   vendor/github.com/rancher/wharfie/pkg/registries/endpoint.go
	modified:   vendor/github.com/rancher/wharfie/pkg/registries/registries.go
	new file:   vendor/github.com/vbatts/tar-split/LICENSE
	new file:   vendor/github.com/vbatts/tar-split/archive/tar/common.go
	new file:   vendor/github.com/vbatts/tar-split/archive/tar/format.go
	new file:   vendor/github.com/vbatts/tar-split/archive/tar/reader.go
	new file:   vendor/github.com/vbatts/tar-split/archive/tar/stat_actime1.go
	new file:   vendor/github.com/vbatts/tar-split/archive/tar/stat_actime2.go
	new file:   vendor/github.com/vbatts/tar-split/archive/tar/stat_unix.go
	new file:   vendor/github.com/vbatts/tar-split/archive/tar/strconv.go
	new file:   vendor/github.com/vbatts/tar-split/archive/tar/writer.go
	deleted:    vendor/go.uber.org/atomic/.codecov.yml
	deleted:    vendor/go.uber.org/atomic/.gitignore
	deleted:    vendor/go.uber.org/atomic/.travis.yml
	deleted:    vendor/go.uber.org/atomic/CHANGELOG.md
	deleted:    vendor/go.uber.org/atomic/LICENSE.txt
	deleted:    vendor/go.uber.org/atomic/Makefile
	deleted:    vendor/go.uber.org/atomic/README.md
	deleted:    vendor/go.uber.org/atomic/bool.go
	deleted:    vendor/go.uber.org/atomic/bool_ext.go
	deleted:    vendor/go.uber.org/atomic/doc.go
	deleted:    vendor/go.uber.org/atomic/duration.go
	deleted:    vendor/go.uber.org/atomic/duration_ext.go
	deleted:    vendor/go.uber.org/atomic/error.go
	deleted:    vendor/go.uber.org/atomic/float64.go
	deleted:    vendor/go.uber.org/atomic/float64_ext.go
	deleted:    vendor/go.uber.org/atomic/gen.go
	deleted:    vendor/go.uber.org/atomic/int32.go
	deleted:    vendor/go.uber.org/atomic/int64.go
	deleted:    vendor/go.uber.org/atomic/nocmp.go
	deleted:    vendor/go.uber.org/atomic/string.go
	deleted:    vendor/go.uber.org/atomic/string_ext.go
	deleted:    vendor/go.uber.org/atomic/uint32.go
	deleted:    vendor/go.uber.org/atomic/uint64.go
	deleted:    vendor/go.uber.org/atomic/value.go
	deleted:    vendor/go.uber.org/multierr/.travis.yml
	modified:   vendor/go.uber.org/multierr/CHANGELOG.md
	modified:   vendor/go.uber.org/multierr/LICENSE.txt
	modified:   vendor/go.uber.org/multierr/Makefile
	modified:   vendor/go.uber.org/multierr/README.md
	modified:   vendor/go.uber.org/multierr/error.go
	renamed:    vendor/go.uber.org/atomic/error_ext.go -> vendor/go.uber.org/multierr/error_post_go120.go
	renamed:    vendor/go.uber.org/multierr/go113.go -> vendor/go.uber.org/multierr/error_pre_go120.go
	deleted:    vendor/go.uber.org/multierr/glide.yaml
	new file:   vendor/k8s.io/utils/net/ipfamily.go
	modified:   vendor/k8s.io/utils/net/net.go
	modified:   vendor/k8s.io/utils/net/port.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   vendor/modules.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@macedogm
Copy link
Collaborator

macedogm commented Dec 3, 2024

@bk201 this failed, because the Wharfie bump requires bumping the Go version to 1.22. Should I create a new PR that does this? I'm not sure what are the policies around bumping Go's version.

@macedogm macedogm force-pushed the mergify/bp/v1.3/pr-890 branch from a6974f5 to 6cffeca Compare December 6, 2024 10:06
@macedogm
Copy link
Collaborator

macedogm commented Dec 6, 2024

@bk201 I had to bump the Go version to 1.22, due to the same version being used in Wharfie. PTAL.

@bk201 bk201 requested a review from Vicente-Cheng December 6, 2024 13:16
bk201
bk201 approved these changes Dec 6, 2024
View reviewed changes
Copy link
Member

@bk201 bk201 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

Vicente-Cheng
Vicente-Cheng approved these changes Dec 18, 2024
View reviewed changes
Copy link
Contributor

@Vicente-Cheng Vicente-Cheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Vicente-Cheng Vicente-Cheng merged commit f6461e0 into v1.3 Dec 18, 2024
7 checks passed
@bk201 bk201 deleted the mergify/bp/v1.3/pr-890 branch December 23, 2024 00:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bk201 bk201 bk201 approved these changes

@Vicente-Cheng Vicente-Cheng Vicente-Cheng approved these changes

Assignees

@macedogm macedogm

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@macedogm @Vicente-Cheng @bk201