feat: bump go to v1.20.10 (backport #578) #590

mergify · 2023-11-03T08:57:33Z

This is an automatic backport of pull request #578 done by Mergify.
Cherry-pick of dd09177 has failed:

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

You are currently cherry-picking commit dd09177.
  (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:
	deleted:    vendor/golang.org/x/crypto/AUTHORS
	deleted:    vendor/golang.org/x/crypto/CONTRIBUTORS
	modified:   vendor/golang.org/x/crypto/chacha20/chacha_arm64.go
	modified:   vendor/golang.org/x/crypto/chacha20/chacha_arm64.s
	modified:   vendor/golang.org/x/crypto/chacha20/chacha_generic.go
	modified:   vendor/golang.org/x/crypto/chacha20/chacha_noasm.go
	modified:   vendor/golang.org/x/crypto/chacha20/chacha_s390x.go
	modified:   vendor/golang.org/x/crypto/curve25519/curve25519.go
	new file:   vendor/golang.org/x/crypto/curve25519/curve25519_compat.go
	new file:   vendor/golang.org/x/crypto/curve25519/curve25519_go120.go
	modified:   vendor/golang.org/x/crypto/curve25519/internal/field/fe_amd64.go
	modified:   vendor/golang.org/x/crypto/curve25519/internal/field/fe_generic.go
	deleted:    vendor/golang.org/x/crypto/ed25519/ed25519.go
	renamed:    vendor/golang.org/x/crypto/internal/subtle/aliasing.go -> vendor/golang.org/x/crypto/internal/alias/alias.go
	renamed:    vendor/golang.org/x/crypto/internal/subtle/aliasing_purego.go -> vendor/golang.org/x/crypto/internal/alias/alias_purego.go
	modified:   vendor/golang.org/x/crypto/internal/poly1305/sum_generic.go
	modified:   vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.go
	modified:   vendor/golang.org/x/crypto/ssh/certs.go
	modified:   vendor/golang.org/x/crypto/ssh/cipher.go
	modified:   vendor/golang.org/x/crypto/ssh/client_auth.go
	modified:   vendor/golang.org/x/crypto/ssh/common.go
	modified:   vendor/golang.org/x/crypto/ssh/connection.go
	modified:   vendor/golang.org/x/crypto/ssh/doc.go
	modified:   vendor/golang.org/x/crypto/ssh/handshake.go
	modified:   vendor/golang.org/x/crypto/ssh/kex.go
	modified:   vendor/golang.org/x/crypto/ssh/keys.go
	modified:   vendor/golang.org/x/crypto/ssh/mac.go
	modified:   vendor/golang.org/x/crypto/ssh/messages.go
	modified:   vendor/golang.org/x/crypto/ssh/mux.go
	modified:   vendor/golang.org/x/crypto/ssh/server.go
	modified:   vendor/golang.org/x/crypto/ssh/session.go
	modified:   vendor/golang.org/x/crypto/ssh/transport.go
	modified:   vendor/golang.org/x/net/idna/idna9.0.0.go
	modified:   vendor/golang.org/x/net/idna/tables13.0.0.go
	new file:   vendor/golang.org/x/net/idna/tables15.0.0.go
	modified:   vendor/golang.org/x/net/idna/trie.go
	new file:   vendor/golang.org/x/net/idna/trie12.0.0.go
	new file:   vendor/golang.org/x/net/idna/trie13.0.0.go
	modified:   vendor/golang.org/x/sys/cpu/cpu.go
	modified:   vendor/golang.org/x/sys/cpu/cpu_riscv64.go
	modified:   vendor/golang.org/x/sys/cpu/cpu_x86.go
	modified:   vendor/golang.org/x/sys/cpu/endian_little.go
	modified:   vendor/golang.org/x/sys/cpu/hwcap_linux.go
	new file:   vendor/golang.org/x/sys/cpu/runtime_auxv.go
	new file:   vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go
	deleted:    vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go
	new file:   vendor/golang.org/x/sys/unix/ioctl_signed.go
	renamed:    vendor/golang.org/x/sys/unix/ioctl.go -> vendor/golang.org/x/sys/unix/ioctl_unsigned.go
	modified:   vendor/golang.org/x/sys/unix/ioctl_zos.go
	modified:   vendor/golang.org/x/sys/unix/mkall.sh
	modified:   vendor/golang.org/x/sys/unix/mkerrors.sh
	new file:   vendor/golang.org/x/sys/unix/mmap_nomremap.go
	new file:   vendor/golang.org/x/sys/unix/mremap.go
	modified:   vendor/golang.org/x/sys/unix/syscall_aix.go
	modified:   vendor/golang.org/x/sys/unix/syscall_aix_ppc.go
	modified:   vendor/golang.org/x/sys/unix/syscall_aix_ppc64.go
	modified:   vendor/golang.org/x/sys/unix/syscall_bsd.go
	modified:   vendor/golang.org/x/sys/unix/syscall_darwin.go
	modified:   vendor/golang.org/x/sys/unix/syscall_dragonfly.go
	modified:   vendor/golang.org/x/sys/unix/syscall_freebsd.go
	modified:   vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
	modified:   vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
	modified:   vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
	modified:   vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
	modified:   vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
	modified:   vendor/golang.org/x/sys/unix/syscall_hurd.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_386.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_arm.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
	modified:   vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
	modified:   vendor/golang.org/x/sys/unix/syscall_netbsd.go
	modified:   vendor/golang.org/x/sys/unix/syscall_openbsd.go
	modified:   vendor/golang.org/x/sys/unix/syscall_solaris.go
	modified:   vendor/golang.org/x/sys/unix/syscall_unix.go
	modified:   vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_386.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
	modified:   vendor/golang.org/x/sys/unix/zptrace_armnn_linux.go
	modified:   vendor/golang.org/x/sys/unix/zptrace_linux_arm64.go
	modified:   vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
	modified:   vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
	modified:   vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
	modified:   vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
	modified:   vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_freebsd_riscv64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_riscv64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.s
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.s
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.s
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.s
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.s
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_ppc64.s
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_openbsd_riscv64.s
	modified:   vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zsyscall_zos_s390x.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
	modified:   vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_386.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
	modified:   vendor/golang.org/x/sys/windows/env_windows.go
	modified:   vendor/golang.org/x/sys/windows/exec_windows.go
	modified:   vendor/golang.org/x/sys/windows/security_windows.go
	modified:   vendor/golang.org/x/sys/windows/service.go
	modified:   vendor/golang.org/x/sys/windows/syscall_windows.go
	modified:   vendor/golang.org/x/sys/windows/types_windows.go
	modified:   vendor/golang.org/x/sys/windows/zsyscall_windows.go
	modified:   vendor/golang.org/x/text/unicode/bidi/tables13.0.0.go
	new file:   vendor/golang.org/x/text/unicode/bidi/tables15.0.0.go
	modified:   vendor/golang.org/x/text/unicode/bidi/trieval.go
	modified:   vendor/golang.org/x/text/unicode/norm/forminfo.go
	modified:   vendor/golang.org/x/text/unicode/norm/tables13.0.0.go
	new file:   vendor/golang.org/x/text/unicode/norm/tables15.0.0.go
	modified:   vendor/golang.org/x/text/unicode/norm/trie.go
	modified:   vendor/gopkg.in/yaml.v3/parserc.go
	deleted:    vendor/k8s.io/apimachinery/pkg/util/errors/BUILD
	modified:   vendor/k8s.io/apimachinery/pkg/util/errors/errors.go
	deleted:    vendor/k8s.io/apimachinery/pkg/util/rand/BUILD
	deleted:    vendor/k8s.io/apimachinery/pkg/util/sets/BUILD
	deleted:    vendor/k8s.io/apimachinery/pkg/util/validation/BUILD
	deleted:    vendor/k8s.io/apimachinery/pkg/util/validation/field/BUILD
	modified:   vendor/k8s.io/apimachinery/pkg/util/validation/field/errors.go
	modified:   vendor/k8s.io/apimachinery/pkg/util/validation/field/path.go
	modified:   vendor/k8s.io/apimachinery/pkg/util/validation/validation.go
	new file:   vendor/k8s.io/utils/LICENSE
	new file:   vendor/k8s.io/utils/internal/third_party/forked/golang/LICENSE
	new file:   vendor/k8s.io/utils/internal/third_party/forked/golang/PATENTS
	new file:   vendor/k8s.io/utils/internal/third_party/forked/golang/net/ip.go
	new file:   vendor/k8s.io/utils/internal/third_party/forked/golang/net/parse.go
	new file:   vendor/k8s.io/utils/net/ipnet.go
	new file:   vendor/k8s.io/utils/net/net.go
	new file:   vendor/k8s.io/utils/net/parse.go
	new file:   vendor/k8s.io/utils/net/port.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Dockerfile.dapper
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   vendor/golang.org/x/sys/execabs/execabs.go
	deleted by us:   vendor/golang.org/x/sys/execabs/execabs_go118.go
	deleted by us:   vendor/golang.org/x/sys/execabs/execabs_go119.go
	both modified:   vendor/modules.txt

Cherry-pick of 0292917 has failed:

On branch mergify/bp/v1.1/pr-578
Your branch is ahead of 'origin/v1.1' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0292917.
  (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:   pkg/config/config_test.go
	modified:   pkg/config/cos.go
	modified:   pkg/config/schemas.go
	modified:   pkg/config/write.go
	modified:   pkg/console/network.go
	modified:   pkg/console/util.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/console/dashboard_panels.go

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

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

@Mergifyio refresh will re-evaluate the rules
@Mergifyio rebase will rebase this PR on its base branch
@Mergifyio update will merge the base branch into this PR
@Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

look at your merge queues
generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Signed-off-by: PoAn Yang <[email protected]> (cherry picked from commit dd09177)

Signed-off-by: PoAn Yang <[email protected]> (cherry picked from commit 0292917)

Signed-off-by: PoAn Yang <[email protected]> (cherry picked from commit 3abd2f4)

Vicente-Cheng

LGTM, thanks!

bk201

lgtm, thanks!

mergify bot added the conflicts label Nov 3, 2023

mergify bot mentioned this pull request Nov 3, 2023

feat: bump go to v1.20.10 #578

Merged

FrankYang0529 added 3 commits November 13, 2023 10:30

feat: update golang to v1.20 and upgrade golang.org/x packages

ddfb48c

Signed-off-by: PoAn Yang <[email protected]> (cherry picked from commit dd09177)

feat: replace yaml packages with gopkg.in/yaml.v3

4e529f5

Signed-off-by: PoAn Yang <[email protected]> (cherry picked from commit 0292917)

fix: trim space for harvester-agent file

46e178a

Signed-off-by: PoAn Yang <[email protected]> (cherry picked from commit 3abd2f4)

FrankYang0529 force-pushed the mergify/bp/v1.1/pr-578 branch from c2f64ab to 46e178a Compare November 13, 2023 02:33

FrankYang0529 requested review from bk201 and Vicente-Cheng November 13, 2023 03:46

Vicente-Cheng approved these changes Nov 13, 2023

View reviewed changes

bk201 approved these changes Nov 14, 2023

View reviewed changes

bk201 merged commit 3f133dd into v1.1 Nov 14, 2023
3 checks passed

mergify bot deleted the mergify/bp/v1.1/pr-578 branch November 14, 2023 03:43

bk201 mentioned this pull request Nov 14, 2023

[TASK] v1.1.3 dependencies harvester/harvester#4670

Closed

22 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: bump go to v1.20.10 (backport #578) #590

feat: bump go to v1.20.10 (backport #578) #590

mergify bot commented Nov 3, 2023

Vicente-Cheng left a comment

bk201 left a comment

feat: bump go to v1.20.10 (backport #578) #590

feat: bump go to v1.20.10 (backport #578) #590

Conversation

mergify bot commented Nov 3, 2023

Vicente-Cheng left a comment

Choose a reason for hiding this comment

bk201 left a comment

Choose a reason for hiding this comment