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

Upgrade k8s to 1.23.1 #7056

Merged
merged 8 commits into from Jan 31, 2022
Merged

Upgrade k8s to 1.23.1 #7056

merged 8 commits into from Jan 31, 2022

Conversation

fossedihelm
Copy link
Contributor

@fossedihelm fossedihelm commented Jan 11, 2022 •
edited

What this PR does / why we need it:
Update k8s dependencies to 1.23.1.
It includes commits from #6974

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:
Files manually changed:

  • api/api-rule-violations-known.list - Add some violations
  • go.mod - Update k8s dependencies
  • staging/src/kubevirt.io/api/go.mod - Update k8s dependencies
  • staging/src/kubevirt.io/client-go/go.mod - Update k8s dependencies
  • pkg/controller/expectations_test.go - Use "k8s.io/utils/clock/testing" instead of "k8s.io/apimachinery/pkg/util/clock"
  • pkg/monitoring/client/prometheus/prometheus.go - Add ctx to Observe method
  • pkg/virt-controller/services/template.go - Use ProbeHandler instead of Handler
  • pkg/virt-controller/services/template_test.go - Use ProbeHandler instead of Handler
  • pkg/virt-operator/resource/generate/components/daemonsets.go - Use ProbeHandler instead of Handler
  • pkg/virt-operator/resource/generate/components/deployments.go - Use ProbeHandler instead of Handler
  • tests/storage/storage.go - Use LifecycleHandler instead of Handler
  • staging/src/kubevirt.io/api/migrations/v1alpha1/openapi_generated.go - Deleted

Release note:

Update k8s dependencies to 0.23.1

@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jan 11, 2022
@kubevirt-bot
Copy link
Contributor

Hi @fossedihelm. Thanks for your PR.

I'm waiting for a kubevirt member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubevirt-bot kubevirt-bot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XXL area/monitoring labels Jan 11, 2022
@fossedihelm
Copy link
Contributor Author

/cc @orelmisan @EdDev

@orelmisan
Copy link
Member

@fossedihelm Thank you for this PR.
Can you please state which files are manually changed?

@orelmisan
Copy link
Member

/test all

@orelmisan
Copy link
Member

/ok-to-test

@kubevirt-bot kubevirt-bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 11, 2022
@fossedihelm
Copy link
Contributor Author

fossedihelm commented Jan 11, 2022 •
edited

Can you please state which files are manually changed?

@orelmisan Thanks, I'm going to add it in the description

@fossedihelm
Copy link
Contributor Author

@orelmisan Edit description

@orelmisan
Copy link
Member

@orelmisan Edit description

Thank you

@orelmisan
Copy link
Member

/test all

@fossedihelm
Copy link
Contributor Author

Add guideline

@fossedihelm
Copy link
Contributor Author

/test all

@kubevirt-bot kubevirt-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 12, 2022
@kubevirt-bot kubevirt-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jan 12, 2022
@orelmisan orelmisan mentioned this pull request Jan 13, 2022
Closed
@kubevirt-bot kubevirt-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed lgtm Indicates that a PR is ready to be merged. labels Jan 28, 2022
@orelmisan @fossedihelm
Upgrade builder image to use go 1.17.5
a94926a 
Signed-off-by: Orel Misan <omisan@redhat.com>
@orelmisan @fossedihelm
Use upgraded builder image
e187f75 
Signed-off-by: Orel Misan <omisan@redhat.com>
@orelmisan @fossedihelm
Upgrade Bazel WORKSPACE file
73acad7 
Upgrade io_bazel_rules_go to v0.29.0
Upgrade bazel_gazelle to v0.24.0
Upgrade go_version to 1.17.5

Signed-off-by: Orel Misan <omisan@redhat.com>
@orelmisan @fossedihelm
Change target "go_tool_library" to "go_default_library"
d91e095 
For more details please see bazelbuild/rules_go#2922
Disable nogo dep "ineffassign"

Signed-off-by: Orel Misan <omisan@redhat.com>
@orelmisan @fossedihelm
Fix non clean package names
4873418 
The updated nogo rules complain about non-clean package names:
package should have the same name as the dir.
For more details please see:
kubevirt#6974 (comment)

The following files are not automatically generated:
hack/gen-proto.sh
pkg/hooks/info/info.go
pkg/hooks/v1alpha1/v1alpha1.go
pkg/hooks/v1alpha2/v1alpha2.go

Signed-off-by: Orel Misan <omisan@redhat.com>
@orelmisan @fossedihelm
Enable ineffassign custom validator
fdb213b 
Signed-off-by: Orel Misan <omisan@redhat.com>
@orelmisan @fossedihelm
Bump containerized-data-importer to v1.42.0
90227f2 
This was done in preparation for k8s.io/client-go bump to v0.23.1

Signed-off-by: Orel Misan <omisan@redhat.com>
@kubevirt-bot kubevirt-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 28, 2022
@fossedihelm
Copy link
Contributor Author

/lgtm /approve

/hold

two minor optional comments. Feel free to remove the hold if you don't want to address them now.

@rmohr pushed the requested changes. Upgrade minimum version of go.mod files and rebased. Thanks

@rmohr
Copy link
Member

rmohr commented Jan 28, 2022

/test pull-kubevirt-fossa

rmohr
rmohr reviewed Jan 28, 2022
View reviewed changes
Copy link
Member

@rmohr rmohr left a comment

Choose a reason for hiding this comment

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

One last thing.

staging/src/kubevirt.io/client-go/go.mod
@@ -6,8 +6,8 @@ require (
github.com/coreos/prometheus-operator v0.38.0
github.com/go-kit/kit v0.9.0
github.com/go-openapi/spec v0.19.3
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
Copy link
Member

Choose a reason for hiding this comment

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

In this file we still have go 1.12.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ouch, I was searching for 1.16, and it slip out to me. Thanks

@fossedihelm
Bump k8s 1.23.1
692d380 
Add a guideline to update k8s dependencies

Signed-off-by: fossedihelm <ffossemo@redhat.com>
@fossedihelm
Copy link
Contributor Author

/retest

@rmohr
Copy link
Member

rmohr commented Jan 31, 2022

/hold cancel
/lgtm

@kubevirt-bot kubevirt-bot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jan 31, 2022
@fossedihelm
Copy link
Contributor Author

/retest

@kubevirt-bot kubevirt-bot merged commit f16dd51 into kubevirt:main Jan 31, 2022
@fossedihelm fossedihelm mentioned this pull request Feb 10, 2022
Closed
@fossedihelm
Copy link
Contributor Author

/cherrypick release-0.49

@kubevirt-bot
Copy link
Contributor

@fossedihelm: #7056 failed to apply on top of branch "release-0.49":

Applying: Upgrade builder image to use go 1.17.5
Applying: Use upgraded builder image
Applying: Upgrade Bazel WORKSPACE file
Applying: Change target "go_tool_library" to "go_default_library"
Applying: Fix non clean package names
Applying: Enable ineffassign custom validator
Applying: Bump containerized-data-importer to v1.42.0
Using index info to reconstruct a base tree...
M	api/openapi-spec/swagger.json
M	go.mod
M	go.sum
M	pkg/virt-operator/resource/generate/components/validations_generated.go
M	staging/src/kubevirt.io/api/go.mod
M	staging/src/kubevirt.io/client-go/api/openapi_generated.go
Falling back to patching base and 3-way merge...
Removing vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/upload/v1beta1/openapi_generated.go
Removing vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/openapi_generated.go
Auto-merging staging/src/kubevirt.io/client-go/api/openapi_generated.go
Auto-merging staging/src/kubevirt.io/api/go.mod
Auto-merging pkg/virt-operator/resource/generate/components/validations_generated.go
Auto-merging go.sum
Auto-merging go.mod
Auto-merging api/openapi-spec/swagger.json
Applying: Bump k8s 1.23.1 Add a guideline to update k8s dependencies
Using index info to reconstruct a base tree...
M	api/openapi-spec/swagger.json
M	go.mod
M	go.sum
M	pkg/controller/BUILD.bazel
M	pkg/virt-controller/services/template.go
M	pkg/virt-operator/resource/generate/components/deployments.go
M	pkg/virt-operator/resource/generate/components/validations_generated.go
M	staging/src/kubevirt.io/api/go.mod
M	staging/src/kubevirt.io/client-go/api/openapi_generated.go
M	tests/storage/storage.go
M	tests/utils.go
A	vendor/github.com/cilium/ebpf/asm/func.go
A	vendor/github.com/cilium/ebpf/asm/func_string.go
A	vendor/github.com/cilium/ebpf/elf_reader.go
A	vendor/github.com/cilium/ebpf/go.mod
A	vendor/github.com/cilium/ebpf/go.sum
A	vendor/github.com/cilium/ebpf/internal/btf/BUILD.bazel
A	vendor/github.com/cilium/ebpf/internal/btf/btf.go
A	vendor/github.com/cilium/ebpf/internal/btf/btf_types.go
A	vendor/github.com/cilium/ebpf/internal/btf/types.go
A	vendor/github.com/cilium/ebpf/internal/syscall.go
A	vendor/github.com/cilium/ebpf/internal/unix/types_linux.go
A	vendor/github.com/cilium/ebpf/internal/unix/types_other.go.git/rebase-apply/patch:3415: trailing whitespace.
Then (if necessary) delete generated code that potentially references deprecated or eliminated stuff (like the mock client) and, on cascade, fix the files[1] that include these (remember which files are affected because at the end you will have to revert the changes you made to restore them).  
.git/rebase-apply/patch:3416: trailing whitespace.
Delete generated code is not a problem because it will be regenerated.  
.git/rebase-apply/patch:3417: trailing whitespace.
Run `make deps-update` to update dependencies.  
.git/rebase-apply/patch:3418: trailing whitespace.
Run `make && make generate` to regenerate the code.  
.git/rebase-apply/patch:3419: trailing whitespace.
Don't forget to restore the files edited in [1].  
warning: squelched 39 whitespace errors
warning: 44 lines add whitespace errors.

A	vendor/github.com/cilium/ebpf/link/iter.go
A	vendor/github.com/cilium/ebpf/link/syscalls.go
A	vendor/github.com/cilium/ebpf/link/uprobe.go
A	vendor/github.com/cilium/ebpf/map.go
A	vendor/github.com/cilium/ebpf/prog.go
A	vendor/github.com/cilium/ebpf/syscalls.go
A	vendor/github.com/cilium/ebpf/types.go
A	vendor/github.com/cilium/ebpf/types_string.go
A	vendor/github.com/opencontainers/runc/libcontainer/cgroups/ebpf/ebpf_linux.go
A	vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go
A	vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go
A	vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs2/hugetlb.go
M	vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
A	vendor/github.com/opencontainers/runc/libcontainer/user/user.go
A	vendor/github.com/willf/bitset/go.mod
A	vendor/github.com/willf/bitset/go.sum
M	vendor/google.golang.org/protobuf/internal/version/version.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Removing vendor/sigs.k8s.io/yaml/go.sum
Removing vendor/sigs.k8s.io/yaml/go.mod
Removing vendor/mvdan.cc/editorconfig/go.sum
Removing vendor/mvdan.cc/editorconfig/go.mod
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Removing vendor/libvirt.org/go/libvirt/go.mod
Removing vendor/k8s.io/klog/v2/go.sum
Removing vendor/k8s.io/klog/v2/go.mod
Removing vendor/k8s.io/client-go/pkg/version/def.bzl
Removing vendor/k8s.io/client-go/kubernetes/typed/discovery/v1alpha1/discovery_client.go
Removing vendor/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/batch_client.go
Removing vendor/k8s.io/api/batch/v2alpha1/types_swagger_doc_generated.go
Removing vendor/k8s.io/api/batch/v2alpha1/types.go
Removing vendor/k8s.io/api/batch/v2alpha1/generated.proto
Removing vendor/gopkg.in/yaml.v2/go.mod
Auto-merging vendor/google.golang.org/protobuf/internal/version/version.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/internal/version/version.go
Removing vendor/google.golang.org/grpc/go.sum
Removing vendor/google.golang.org/grpc/go.mod
Removing vendor/google.golang.org/grpc/.travis.yml
Removing vendor/google.golang.org/appengine/go.sum
Removing vendor/google.golang.org/appengine/go.mod
Removing vendor/golang.org/x/xerrors/go.mod
Removing vendor/golang.org/x/term/term_unix_zos.go
Removing vendor/golang.org/x/term/term_unix_linux.go
Removing vendor/golang.org/x/term/term_solaris.go
Removing vendor/golang.org/x/term/go.sum
Removing vendor/golang.org/x/term/go.mod
Removing vendor/golang.org/x/oauth2/go.sum
Removing vendor/golang.org/x/oauth2/go.mod
Removing vendor/golang.org/x/net/internal/socket/sys_solaris_amd64.s
Removing vendor/golang.org/x/net/internal/socket/sys_solaris.go
Removing vendor/golang.org/x/net/internal/socket/sys_linkname.go
Removing vendor/github.com/vishvananda/netns/go.sum
Removing vendor/github.com/vishvananda/netns/go.mod
Removing vendor/github.com/vishvananda/netlink/go.sum
Removing vendor/github.com/vishvananda/netlink/go.mod
Removing vendor/github.com/spf13/pflag/go.sum
Removing vendor/github.com/spf13/pflag/go.mod
Removing vendor/github.com/spf13/cobra/go.sum
Removing vendor/github.com/spf13/cobra/go.mod
Removing vendor/github.com/spf13/cobra/.travis.yml
Removing vendor/github.com/sirupsen/logrus/go.sum
Removing vendor/github.com/sirupsen/logrus/go.mod
Removing vendor/github.com/prometheus/procfs/go.sum
Removing vendor/github.com/prometheus/procfs/go.mod
Removing vendor/github.com/prometheus/client_golang/prometheus/build_info_pre_1.12.go
Removing vendor/github.com/prometheus/client_golang/prometheus/build_info.go
Removing vendor/github.com/pkg/diff/go.sum
Removing vendor/github.com/pkg/diff/go.mod
Removing vendor/github.com/pborman/uuid/go.sum
Removing vendor/github.com/pborman/uuid/go.mod
CONFLICT (modify/delete): vendor/github.com/opencontainers/runc/libcontainer/user/user.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/opencontainers/runc/libcontainer/user/user.go left in tree.
Auto-merging vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
CONFLICT (content): Merge conflict in vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_linux.go
CONFLICT (modify/delete): vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs2/hugetlb.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs2/hugetlb.go left in tree.
CONFLICT (modify/delete): vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go left in tree.
CONFLICT (modify/delete): vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go left in tree.
CONFLICT (modify/delete): vendor/github.com/opencontainers/runc/libcontainer/cgroups/ebpf/ebpf_linux.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/opencontainers/runc/libcontainer/cgroups/ebpf/ebpf_linux.go left in tree.
Removing vendor/github.com/onsi/gomega/go.sum
Removing vendor/github.com/onsi/gomega/go.mod
Removing vendor/github.com/onsi/ginkgo/go.sum
Removing vendor/github.com/onsi/ginkgo/go.mod
Removing vendor/github.com/nxadm/tail/go.sum
Removing vendor/github.com/nxadm/tail/go.mod
Removing vendor/github.com/modern-go/reflect2/test.sh
Removing vendor/github.com/modern-go/reflect2/go_below_19.go
Removing vendor/github.com/modern-go/reflect2/go_below_17.go
Removing vendor/github.com/modern-go/reflect2/go_above_17.go
Removing vendor/github.com/moby/sys/mountinfo/go.sum
Removing vendor/github.com/moby/sys/mountinfo/go.mod
Removing vendor/github.com/mitchellh/mapstructure/go.mod
Removing vendor/github.com/mattn/go-runewidth/go.mod
Removing vendor/github.com/kr/logfmt/unquote.go
Removing vendor/github.com/kr/logfmt/scanner.go
Removing vendor/github.com/kr/logfmt/decode.go
Removing vendor/github.com/kr/logfmt/Readme
Removing vendor/github.com/kr/logfmt/BUILD.bazel
Removing vendor/github.com/kr/logfmt/.gitignore
Removing vendor/github.com/json-iterator/go/go.sum
Removing vendor/github.com/json-iterator/go/go.mod
Removing vendor/github.com/josharian/intern/go.mod
Removing vendor/github.com/imdario/mergo/go.sum
Removing vendor/github.com/imdario/mergo/go.mod
Removing vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go
Removing vendor/github.com/hashicorp/golang-lru/simplelru/lru.go
Removing vendor/github.com/hashicorp/golang-lru/simplelru/BUILD.bazel
Removing vendor/github.com/hashicorp/golang-lru/lru.go
Removing vendor/github.com/hashicorp/golang-lru/go.mod
Removing vendor/github.com/hashicorp/golang-lru/doc.go
Removing vendor/github.com/hashicorp/golang-lru/arc.go
Removing vendor/github.com/hashicorp/golang-lru/README.md
Removing vendor/github.com/hashicorp/golang-lru/LICENSE
Removing vendor/github.com/hashicorp/golang-lru/BUILD.bazel
Removing vendor/github.com/hashicorp/golang-lru/2q.go
Removing vendor/github.com/hashicorp/golang-lru/.gitignore
Removing vendor/github.com/gorilla/websocket/go.sum
Removing vendor/github.com/gorilla/websocket/go.mod
Removing vendor/github.com/googleapis/gnostic/compiler/extension-handler.go
Removing vendor/github.com/google/uuid/go.mod
Removing vendor/github.com/google/renameio/go.mod
Removing vendor/github.com/google/gofuzz/go.mod
Removing vendor/github.com/godbus/dbus/v5/go.sum
Removing vendor/github.com/godbus/dbus/v5/go.mod
Removing vendor/github.com/go-stack/stack/go.mod
Removing vendor/github.com/go-openapi/validate/go.sum
Removing vendor/github.com/go-openapi/validate/go.mod
Removing vendor/github.com/go-openapi/swag/go.sum
Removing vendor/github.com/go-openapi/swag/go.mod
Removing vendor/github.com/go-openapi/strfmt/go.sum
Removing vendor/github.com/go-openapi/strfmt/go.mod
Removing vendor/github.com/go-openapi/spec/go.sum
Removing vendor/github.com/go-openapi/spec/go.mod
Removing vendor/github.com/go-openapi/runtime/go.sum
Removing vendor/github.com/go-openapi/runtime/go.mod
Removing vendor/github.com/go-openapi/loads/go.sum
Removing vendor/github.com/go-openapi/loads/go.mod
Removing vendor/github.com/go-openapi/jsonreference/go.sum
Removing vendor/github.com/go-openapi/jsonreference/go.mod
Removing vendor/github.com/go-openapi/jsonpointer/go.sum
Removing vendor/github.com/go-openapi/jsonpointer/go.mod
Removing vendor/github.com/go-openapi/errors/go.sum
Removing vendor/github.com/go-openapi/errors/go.mod
Removing vendor/github.com/go-openapi/analysis/go.sum
Removing vendor/github.com/go-openapi/analysis/go.mod
Removing vendor/github.com/go-logr/logr/go.mod
Removing vendor/github.com/go-logfmt/logfmt/go.sum
Removing vendor/github.com/go-logfmt/logfmt/go.mod
Removing vendor/github.com/go-logfmt/logfmt/fuzz.go
Removing vendor/github.com/go-kit/kit/endpoint/endpoint.go
Removing vendor/github.com/go-kit/kit/endpoint/doc.go
Removing vendor/github.com/go-kit/kit/endpoint/BUILD.bazel
Removing vendor/github.com/fsnotify/fsnotify/go.sum
Removing vendor/github.com/fsnotify/fsnotify/go.mod
Removing vendor/github.com/evanphx/json-patch/.travis.yml
Removing vendor/github.com/emicklei/go-restful-openapi/go.sum
Removing vendor/github.com/emicklei/go-restful-openapi/go.mod
Removing vendor/github.com/docker/spdystream/utils.go
Removing vendor/github.com/docker/spdystream/LICENSE.docs
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/types_string.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/types_string.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/types.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/types.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/syscalls.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/syscalls.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/prog.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/prog.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/map.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/map.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/link/uprobe.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/link/uprobe.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/link/syscalls.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/link/syscalls.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/link/iter.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/link/iter.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/internal/unix/types_other.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/internal/unix/types_other.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/internal/unix/types_linux.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/internal/unix/types_linux.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/internal/syscall.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/internal/syscall.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/internal/btf/types.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/internal/btf/types.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/internal/btf/btf_types.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/internal/btf/btf_types.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/internal/btf/btf.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/internal/btf/btf.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/internal/btf/BUILD.bazel deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/internal/btf/BUILD.bazel left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/elf_reader.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/elf_reader.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/asm/func_string.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/asm/func_string.go left in tree.
CONFLICT (modify/delete): vendor/github.com/cilium/ebpf/asm/func.go deleted in HEAD and modified in Bump k8s 1.23.1 Add a guideline to update k8s dependencies. Version Bump k8s 1.23.1 Add a guideline to update k8s dependencies of vendor/github.com/cilium/ebpf/asm/func.go left in tree.
Removing vendor/github.com/cespare/xxhash/v2/go.sum
Removing vendor/github.com/cespare/xxhash/v2/go.mod
Removing vendor/github.com/asaskevich/govalidator/go.mod
Removing vendor/github.com/Azure/go-autorest/tracing/go.sum
Removing vendor/github.com/Azure/go-autorest/tracing/go.mod
Removing vendor/github.com/Azure/go-autorest/logger/go.sum
Removing vendor/github.com/Azure/go-autorest/logger/go.mod
Removing vendor/github.com/Azure/go-autorest/autorest/go.sum
Removing vendor/github.com/Azure/go-autorest/autorest/go.mod
Removing vendor/github.com/Azure/go-autorest/autorest/date/go.sum
Removing vendor/github.com/Azure/go-autorest/autorest/date/go.mod
Removing vendor/github.com/Azure/go-autorest/autorest/adal/go.sum
Removing vendor/github.com/Azure/go-autorest/autorest/adal/go.mod
Auto-merging tests/utils.go
CONFLICT (content): Merge conflict in tests/utils.go
Auto-merging tests/storage/storage.go
Auto-merging staging/src/kubevirt.io/client-go/api/openapi_generated.go
Auto-merging staging/src/kubevirt.io/api/go.mod
CONFLICT (content): Merge conflict in staging/src/kubevirt.io/api/go.mod
Auto-merging pkg/virt-operator/resource/generate/components/validations_generated.go
Auto-merging pkg/virt-operator/resource/generate/components/deployments.go
Auto-merging pkg/virt-controller/services/template.go
Auto-merging pkg/controller/BUILD.bazel
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
Auto-merging api/openapi-spec/swagger.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0008 Bump k8s 1.23.1 Add a guideline to update k8s dependencies
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-0.49

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@fossedihelm fossedihelm mentioned this pull request Mar 9, 2022
Merged
@dhiller dhiller mentioned this pull request Apr 14, 2022
Closed
@rmohr rmohr changed the title Upgrade k8s to 0.23.1 Upgrade k8s to 1.23.1 Apr 19, 2022
@fossedihelm fossedihelm deleted the bump_k8s_1_23 branch November 17, 2022 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rmohr rmohr rmohr approved these changes

@EdDev EdDev Awaiting requested review from EdDev

@orelmisan orelmisan Awaiting requested review from orelmisan

@vatsalparekh vatsalparekh Awaiting requested review from vatsalparekh

@vladikr vladikr Awaiting requested review from vladikr

Assignees

@rmohr rmohr

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/monitoring dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@fossedihelm @kubevirt-bot @orelmisan @rmohr