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

networkAddonsConfig status, Remove heartbeat #1291

Merged
merged 2 commits into from
Mar 22, 2022
Merged

networkAddonsConfig status, Remove heartbeat #1291

merged 2 commits into from
Mar 22, 2022

Conversation

RamLavi
Copy link
Collaborator

@RamLavi RamLavi commented Mar 22, 2022

What this PR does / why we need it:
This PR reduces networkAddonsConfig status changes being done every ~1minute, mainly by removing the LastHeartbeatTime field.

Special notes for your reviewer:

Release note:

Removing `LastHeartbeatTime` field from networkAddonsConfig status

@RamLavi
vendor, bump custom-resource-status to v1.1.2
32c8de7 
In order to use SetStatusConditionNoHeartbeat(), bumping to v1.1.2

Signed-off-by: Ram Lavi <ralavi@redhat.com>
@RamLavi
status-manager, Move to SetStatusConditionNoHeartbeat
82ba4a5 
Removing LastHeartbeatTime from current status condition since it causes
resourceVersion to rotate every networkAddonsConfig reconcile (~1
minute).
Avoiding duplicate reporting using IsStatusConditionPresentAndEqual()
Moving to Patch method which is better.

Signed-off-by: Ram Lavi <ralavi@redhat.com>
@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. size/XXL labels Mar 22, 2022
@sonarcloud
Copy link

sonarcloud bot commented Mar 22, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@RamLavi RamLavi changed the title Remove heartbeat networkAddonsConfig status, Remove heartbeat Mar 22, 2022
@qinqon
Copy link
Collaborator

qinqon commented Mar 22, 2022

Patch and bump make sense

/lgtm
/approve

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 22, 2022
@kubevirt-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qinqon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 22, 2022
@kubevirt-bot kubevirt-bot merged commit 3fe2c80 into kubevirt:main Mar 22, 2022
@RamLavi
Copy link
Collaborator Author

RamLavi commented Mar 28, 2022

/cherry-pick release-0.65

@kubevirt-bot
Copy link
Collaborator

@RamLavi: #1291 failed to apply on top of branch "release-0.65":

Applying: vendor, bump custom-resource-status to v1.1.2
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/go-logr/logr/logr.go
M	vendor/github.com/go-openapi/swag/.golangci.yml
M	vendor/github.com/go-openapi/swag/.travis.yml
M	vendor/github.com/mailru/easyjson/jlexer/lexer.go
M	vendor/github.com/onsi/gomega/.travis.yml
M	vendor/github.com/onsi/gomega/CHANGELOG.md
A	vendor/github.com/onsi/gomega/Dockerfile
M	vendor/github.com/onsi/gomega/Makefile
A	vendor/github.com/onsi/gomega/docker-compose.yaml
M	vendor/github.com/onsi/gomega/gomega_dsl.go
M	vendor/github.com/onsi/gomega/matchers.go
A	vendor/github.com/onsi/gomega/matchers/have_field.go
A	vendor/github.com/onsi/gomega/matchers/have_http_body_matcher.go
M	vendor/github.com/onsi/gomega/matchers/have_http_status_matcher.go
A	vendor/golang.org/x/mod/modfile/read.go
A	vendor/golang.org/x/mod/modfile/rule.go
M	vendor/golang.org/x/mod/module/module.go
M	vendor/golang.org/x/mod/semver/semver.go
M	vendor/golang.org/x/net/http2/server.go
M	vendor/golang.org/x/sys/cpu/cpu_gc_x86.go
M	vendor/golang.org/x/sys/cpu/cpu_x86.go
M	vendor/golang.org/x/sys/cpu/cpu_x86.s
A	vendor/golang.org/x/sys/plan9/pwd_go15_plan9.go
A	vendor/golang.org/x/sys/plan9/pwd_plan9.go
A	vendor/golang.org/x/sys/plan9/race.go
A	vendor/golang.org/x/sys/plan9/race0.go
A	vendor/golang.org/x/sys/plan9/str.go
A	vendor/golang.org/x/sys/plan9/syscall.go
A	vendor/golang.org/x/sys/plan9/syscall_plan9.go
A	vendor/golang.org/x/sys/plan9/zsyscall_plan9_386.go
A	vendor/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go
A	vendor/golang.org/x/sys/plan9/zsyscall_plan9_arm.go
M	vendor/golang.org/x/sys/unix/README.md
M	vendor/golang.org/x/sys/unix/mkall.sh
M	vendor/golang.org/x/sys/unix/mkerrors.sh
M	vendor/golang.org/x/sys/unix/sockcmsg_linux.go
M	vendor/golang.org/x/sys/unix/syscall_aix.go
M	vendor/golang.org/x/sys/unix/syscall_bsd.go
M	vendor/golang.org/x/sys/unix/syscall_darwin.go
M	vendor/golang.org/x/sys/unix/syscall_dragonfly.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd.go
M	vendor/golang.org/x/sys/unix/syscall_linux.go
M	vendor/golang.org/x/sys/unix/syscall_netbsd.go
M	vendor/golang.org/x/sys/unix/syscall_openbsd.go
M	vendor/golang.org/x/sys/unix/syscall_solaris.go
A	vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
M	vendor/golang.org/x/sys/unix/zerrors_linux.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
A	vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
M	vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
M	vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
A	vendor/golang.org/x/sys/unix/zsyscall_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
M	vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
M	vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
A	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
M	vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_386.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
A	vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
M	vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
M	vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
M	vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
M	vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
M	vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go
M	vendor/golang.org/x/sys/windows/exec_windows.go
M	vendor/golang.org/x/sys/windows/mksyscall.go
A	vendor/golang.org/x/sys/windows/setupapierrors_windows.go
M	vendor/golang.org/x/sys/windows/syscall_windows.go
M	vendor/golang.org/x/sys/windows/types_windows.go
M	vendor/golang.org/x/sys/windows/zsyscall_windows.go
A	vendor/golang.org/x/term/term.go
M	vendor/golang.org/x/tools/go/ast/astutil/rewrite.go
A	vendor/golang.org/x/tools/go/ast/inspector/typeof.go
M	vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
M	vendor/golang.org/x/tools/go/internal/gcimporter/iexport.go
M	vendor/golang.org/x/tools/go/internal/gcimporter/iimport.go
M	vendor/golang.org/x/tools/go/packages/packages.go
M	vendor/golang.org/x/tools/internal/imports/zstdlib.go
A	vendor/golang.org/x/tools/internal/typeparams/common.go
A	vendor/golang.org/x/tools/internal/typeparams/notypeparams.go
A	vendor/golang.org/x/tools/internal/typeparams/typeparams.go
M	vendor/k8s.io/klog/v2/klog.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/k8s.io/klog/v2/klog.go
CONFLICT (content): Merge conflict in vendor/k8s.io/klog/v2/klog.go
CONFLICT (modify/delete): vendor/golang.org/x/tools/internal/typeparams/common.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/tools/internal/typeparams/common.go left in tree.
Auto-merging vendor/golang.org/x/tools/internal/imports/zstdlib.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/tools/internal/imports/zstdlib.go
Auto-merging vendor/golang.org/x/tools/go/packages/packages.go
Auto-merging vendor/golang.org/x/tools/go/internal/gcimporter/iimport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/tools/go/internal/gcimporter/iimport.go
Auto-merging vendor/golang.org/x/tools/go/internal/gcimporter/iexport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/tools/go/internal/gcimporter/iexport.go
Auto-merging vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
CONFLICT (modify/delete): vendor/golang.org/x/tools/go/ast/inspector/typeof.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/tools/go/ast/inspector/typeof.go left in tree.
Auto-merging vendor/golang.org/x/tools/go/ast/astutil/rewrite.go
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/types_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/syscall.go
Auto-merging vendor/golang.org/x/sys/windows/str.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/str.go
Auto-merging vendor/golang.org/x/sys/windows/race0.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/race0.go
Auto-merging vendor/golang.org/x/sys/windows/race.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/race.go
Auto-merging vendor/golang.org/x/sys/windows/mksyscall.go
Auto-merging vendor/golang.org/x/sys/windows/exec_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/exec_windows.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_openbsd_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_openbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gccgo.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64_gc.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_aix_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/syscall_zos_s390x.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/sys/unix/syscall_zos_s390x.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/syscall_solaris.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_solaris.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_openbsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_netbsd.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_netbsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_dragonfly.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_dragonfly.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_darwin.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_bsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_aix.go
Auto-merging vendor/golang.org/x/sys/unix/sockcmsg_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/sockcmsg_linux.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging vendor/golang.org/x/sys/unix/mkall.sh
Auto-merging vendor/golang.org/x/sys/unix/README.md
CONFLICT (modify/delete): vendor/golang.org/x/sys/plan9/zsyscall_plan9_arm.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/sys/plan9/zsyscall_plan9_arm.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/plan9/zsyscall_plan9_386.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/sys/plan9/zsyscall_plan9_386.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/plan9/syscall_plan9.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/sys/plan9/syscall_plan9.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/plan9/pwd_plan9.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/sys/plan9/pwd_plan9.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/plan9/pwd_go15_plan9.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/sys/plan9/pwd_go15_plan9.go left in tree.
Auto-merging vendor/golang.org/x/sys/cpu/cpu_x86.s
Auto-merging vendor/golang.org/x/sys/cpu/cpu_x86.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/cpu/cpu_x86.go
Auto-merging vendor/golang.org/x/sys/cpu/cpu_gc_x86.go
Auto-merging vendor/golang.org/x/net/http2/server.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/server.go
Auto-merging vendor/golang.org/x/mod/semver/semver.go
Auto-merging vendor/golang.org/x/mod/module/module.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/mod/module/module.go
CONFLICT (modify/delete): vendor/golang.org/x/mod/modfile/rule.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/golang.org/x/mod/modfile/rule.go left in tree.
Auto-merging vendor/golang.org/x/crypto/ssh/terminal/util_plan9.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/crypto/ssh/terminal/util_plan9.go
Auto-merging vendor/github.com/rogpeppe/go-internal/modfile/read.go
Auto-merging vendor/github.com/onsi/gomega/matchers/have_http_status_matcher.go
CONFLICT (content): Merge conflict in vendor/github.com/onsi/gomega/matchers/have_http_status_matcher.go
CONFLICT (modify/delete): vendor/github.com/onsi/gomega/matchers/have_http_body_matcher.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/github.com/onsi/gomega/matchers/have_http_body_matcher.go left in tree.
CONFLICT (modify/delete): vendor/github.com/onsi/gomega/matchers/have_field.go deleted in HEAD and modified in vendor, bump custom-resource-status to v1.1.2. Version vendor, bump custom-resource-status to v1.1.2 of vendor/github.com/onsi/gomega/matchers/have_field.go left in tree.
Auto-merging vendor/github.com/onsi/gomega/matchers.go
CONFLICT (content): Merge conflict in vendor/github.com/onsi/gomega/matchers.go
Auto-merging vendor/github.com/onsi/gomega/gomega_dsl.go
CONFLICT (content): Merge conflict in vendor/github.com/onsi/gomega/gomega_dsl.go
CONFLICT (modify/delete): vendor/github.com/onsi/gomega/Makefile deleted in vendor, bump custom-resource-status to v1.1.2 and modified in HEAD. Version HEAD of vendor/github.com/onsi/gomega/Makefile left in tree.
Auto-merging vendor/github.com/onsi/gomega/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/github.com/onsi/gomega/CHANGELOG.md
CONFLICT (modify/delete): vendor/github.com/onsi/gomega/.travis.yml deleted in vendor, bump custom-resource-status to v1.1.2 and modified in HEAD. Version HEAD of vendor/github.com/onsi/gomega/.travis.yml left in tree.
Auto-merging vendor/github.com/mailru/easyjson/jlexer/lexer.go
CONFLICT (modify/delete): vendor/github.com/go-openapi/swag/.travis.yml deleted in vendor, bump custom-resource-status to v1.1.2 and modified in HEAD. Version HEAD of vendor/github.com/go-openapi/swag/.travis.yml left in tree.
Auto-merging vendor/github.com/go-openapi/swag/.golangci.yml
CONFLICT (content): Merge conflict in vendor/github.com/go-openapi/swag/.golangci.yml
Auto-merging vendor/github.com/go-logr/logr/logr.go
CONFLICT (content): Merge conflict in vendor/github.com/go-logr/logr/logr.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 vendor, bump custom-resource-status to v1.1.2
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:

/cherry-pick release-0.65

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.

@RamLavi RamLavi mentioned this pull request Mar 29, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rhrazdil rhrazdil rhrazdil approved these changes

@alonSadan alonSadan Awaiting requested review from alonSadan

@phoracek phoracek Awaiting requested review from phoracek

Assignees

@qinqon qinqon

@rhrazdil rhrazdil

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. 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.
4 participants
@RamLavi @qinqon @kubevirt-bot @rhrazdil