Bug OCPBUGS-944: Fix RBAC race during initial deployment by mdbooth · Pull Request #154 · openshift/csi-driver-manila-operator

mdbooth · 2022-09-06T11:08:37Z

No description provided.

openshift-ci · 2022-09-06T11:10:16Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mdbooth

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [mdbooth]

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

bertinatto

The library-go bump isn't necessary for this PR, but since we need to bump it anyway, I'm tagging this PR.

/lgtm

openshift-ci-robot · 2022-09-06T13:03:20Z

/retest-required

Remaining retests: 0 against base HEAD 82a9931 and 2 for PR HEAD b9e861d in total

mdbooth · 2022-09-06T16:04:07Z

Looks like the test failure was due to openshift/cluster-cloud-controller-manager-operator#202 which has now merged.

/retest-required

openshift-ci-robot · 2022-09-06T16:23:13Z

@mdbooth: This pull request references Jira Issue OCPBUGS-944, which is invalid:

expected the bug to target the "4.12.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

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.

mdbooth · 2022-09-06T16:24:27Z

/jira refresh

openshift-ci-robot · 2022-09-06T16:24:34Z

@mdbooth: This pull request references Jira Issue OCPBUGS-944, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.12.0) matches configured target version for branch (4.12.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

/jira refresh

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.

mdbooth · 2022-09-07T08:06:51Z

/retest-required

openshift-ci · 2022-09-07T09:13:50Z

@mdbooth: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

openshift-ci-robot · 2022-09-07T09:17:46Z

@mdbooth: All pull requests linked via external trackers have merged:

openshift/csi-driver-manila-operator#154

Jira Issue OCPBUGS-944 has been moved to the MODIFIED state.

Details

In response to this:

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.

mandre · 2023-07-24T05:28:51Z

We're seeing the same problem in 4.11: https://issues.redhat.com/browse/OCPBUGS-8067
/cherry-pick release-4.11

openshift-cherrypick-robot · 2023-07-24T05:29:34Z

@mandre: #154 failed to apply on top of branch "release-4.11":

Applying: Bump library-go
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
A	vendor/golang.org/x/net/AUTHORS
A	vendor/golang.org/x/net/CONTRIBUTORS
M	vendor/golang.org/x/net/http2/client_conn_pool.go
M	vendor/golang.org/x/net/http2/writesched_priority.go
A	vendor/golang.org/x/sys/AUTHORS
A	vendor/golang.org/x/sys/CONTRIBUTORS
M	vendor/golang.org/x/sys/cpu/byteorder.go
M	vendor/golang.org/x/sys/cpu/cpu.go
M	vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c
M	vendor/golang.org/x/sys/cpu/syscall_aix_gccgo.go
M	vendor/golang.org/x/sys/plan9/syscall.go
M	vendor/golang.org/x/sys/plan9/syscall_plan9.go
M	vendor/golang.org/x/sys/unix/endian_little.go
A	vendor/golang.org/x/sys/unix/errors_freebsd_386.go
A	vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go
A	vendor/golang.org/x/sys/unix/errors_freebsd_arm.go
A	vendor/golang.org/x/sys/unix/errors_freebsd_arm64.go
M	vendor/golang.org/x/sys/unix/ifreq_linux.go
M	vendor/golang.org/x/sys/unix/ioctl_linux.go
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/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_freebsd_386.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
M	vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
M	vendor/golang.org/x/sys/unix/syscall_illumos.go
M	vendor/golang.org/x/sys/unix/syscall_linux.go
M	vendor/golang.org/x/sys/unix/syscall_linux_386.go
M	vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
M	vendor/golang.org/x/sys/unix/syscall_linux_arm.go
M	vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
M	vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
M	vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
M	vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
M	vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
M	vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
M	vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
M	vendor/golang.org/x/sys/unix/syscall_linux_sparc64.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_openbsd_mips64.go
M	vendor/golang.org/x/sys/unix/syscall_solaris.go
M	vendor/golang.org/x/sys/unix/syscall_unix.go
M	vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
M	vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
M	vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
M	vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.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
M	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_darwin_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
M	vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
M	vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
M	vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.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_arm.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.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_mips64le.go
M	vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
M	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_riscv64.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/zsyscall_openbsd_386.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
M	vendor/golang.org/x/sys/unix/zsyscall_openbsd_mips64.go
M	vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
M	vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
M	vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
M	vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
M	vendor/golang.org/x/sys/unix/zsysnum_freebsd_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
M	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_freebsd_386.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
M	vendor/golang.org/x/sys/unix/ztypes_freebsd_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
M	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.git/rebase-apply/patch:2491: trailing whitespace.
	  callback mechanism which is called when a simple domain match fails. 
.git/rebase-apply/patch:2576: trailing whitespace.
v2.11.0 
.git/rebase-apply/patch:2661: trailing whitespace.
[Full API of a UserResource](https://github.com/emicklei/go-restful/blob/v3/examples/user-resource/restful-user-resource.go) 
.git/rebase-apply/patch:2683: trailing whitespace.
- Use [jsoniter](https://github.com/json-iterator/go) by build this package using a tag, e.g. `go build -tags=jsoniter .` 
.git/rebase-apply/patch:4190: trailing whitespace.
We need a way for no-FF teams to be able to merge post-FF that does not require a BZ.  For non-shared repos that mechanism is the 
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.

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/unix/ztypes_solaris_amd64.go
M	vendor/golang.org/x/sys/windows/exec_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
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
Removing vendor/k8s.io/component-base/traces/utils.go
Removing vendor/k8s.io/component-base/logs/validate.go
Removing vendor/k8s.io/component-base/logs/registry/registry.go
Removing vendor/k8s.io/component-base/logs/options.go
Removing vendor/k8s.io/component-base/logs/config.go
Removing vendor/k8s.io/component-base/config/v1alpha1/zz_generated.deepcopy.go
Removing vendor/k8s.io/component-base/config/v1alpha1/zz_generated.conversion.go
Removing vendor/k8s.io/component-base/config/v1alpha1/types.go
Removing vendor/k8s.io/component-base/config/v1alpha1/register.go
Removing vendor/k8s.io/component-base/config/v1alpha1/defaults.go
Removing vendor/k8s.io/component-base/config/v1alpha1/conversion.go
Removing vendor/k8s.io/component-base/config/types.go
Removing vendor/k8s.io/apiserver/pkg/util/flowcontrol/metrics/sample_and_watermark.go
Removing vendor/k8s.io/apiserver/pkg/util/flowcontrol/metrics/observer.go
Removing vendor/k8s.io/apiserver/pkg/storage/cacher/metrics.go
Removing vendor/k8s.io/apiserver/pkg/audit/policy/enforce.go
Removing vendor/google.golang.org/grpc/internal/grpcutil/target.go
Removing vendor/google.golang.org/grpc/internal/credentials/spiffe_appengine.go
Removing vendor/google.golang.org/grpc/install_gae.sh
Removing vendor/google.golang.org/grpc/credentials/go12.go
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.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
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_ppc.go
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
CONFLICT (add/add): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux_loong64.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 (add/add): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
CONFLICT (add/add): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
Auto-merging 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_riscv64.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_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
CONFLICT (add/add): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
Auto-merging 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
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.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
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
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
CONFLICT (add/add): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_loong64.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/syscall_unix.go
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_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
CONFLICT (add/add): Merge conflict in vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_386.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_illumos.go
CONFLICT (add/add): Merge conflict in vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_bsd.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_bsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_aix.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_aix.go
Auto-merging 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/ioctl_linux.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ioctl_linux.go
Auto-merging vendor/golang.org/x/sys/plan9/syscall.go
Removing vendor/golang.org/x/sync/CONTRIBUTORS
Removing vendor/golang.org/x/sync/AUTHORS
CONFLICT (rename/delete): vendor/golang.org/x/sys/CONTRIBUTORS deleted in Bump library-go and renamed to vendor/golang.org/x/oauth2/CONTRIBUTORS in HEAD. Version HEAD of vendor/golang.org/x/oauth2/CONTRIBUTORS left in tree.
CONFLICT (rename/delete): vendor/golang.org/x/sys/AUTHORS deleted in Bump library-go and renamed to vendor/golang.org/x/oauth2/AUTHORS in HEAD. Version HEAD of vendor/golang.org/x/oauth2/AUTHORS left in tree.
Removing vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01.crd.yaml-patch
Removing vendor/github.com/openshift/api/howqq
Removing vendor/github.com/openshift/api/Dockerfile.build
CONFLICT (rename/delete): vendor/golang.org/x/net/CONTRIBUTORS deleted in Bump library-go and renamed to vendor/github.com/golang/protobuf/CONTRIBUTORS in HEAD. Version HEAD of vendor/github.com/golang/protobuf/CONTRIBUTORS left in tree.
CONFLICT (rename/delete): vendor/golang.org/x/net/AUTHORS deleted in Bump library-go and renamed to vendor/github.com/golang/protobuf/AUTHORS in HEAD. Version HEAD of vendor/github.com/golang/protobuf/AUTHORS left in tree.
Removing vendor/github.com/emicklei/go-restful/Makefile
Removing vendor/github.com/emicklei/go-restful/.travis.yml
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 Bump library-go
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".

Details

In response to this:

We're seeing the same problem in 4.11: https://issues.redhat.com/browse/OCPBUGS-8067
/cherry-pick release-4.11

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.

mandre · 2023-07-24T05:31:51Z

Great, there's a library-go bump that prevents backporting the patch via automated tooling. Will have to backport manually.

mdbooth added 2 commits September 6, 2022 12:01

Bump library-go

b5a6d5d

Fix SCC admission failure race during initial deployment

b9e861d

openshift-ci bot requested review from bertinatto and pierreprinetti September 6, 2022 11:10

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 6, 2022

bertinatto reviewed Sep 6, 2022

View reviewed changes

openshift-ci bot assigned bertinatto Sep 6, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 6, 2022

mdbooth changed the title ~~Fix RBAC race during initial deployment~~ Bug OCPBUGS-944: Fix RBAC race during initial deployment Sep 6, 2022

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 6, 2022

openshift-merge-robot merged commit aff5f74 into openshift:master Sep 7, 2022

pierreprinetti deleted the rbac-race branch September 7, 2022 09:36

mandre mentioned this pull request Jul 24, 2023

OCPBUGS-16678: Fix SCC admission failure race during initial deployment openshift/openstack-cinder-csi-driver-operator#120

Merged

Conversation

mdbooth commented Sep 6, 2022

Uh oh!

openshift-ci bot commented Sep 6, 2022

Uh oh!

bertinatto left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Sep 6, 2022

Uh oh!

mdbooth commented Sep 6, 2022

Uh oh!

openshift-ci-robot commented Sep 6, 2022

Uh oh!

mdbooth commented Sep 6, 2022

Uh oh!

openshift-ci-robot commented Sep 6, 2022

Uh oh!

mdbooth commented Sep 7, 2022

Uh oh!

openshift-ci bot commented Sep 7, 2022

Uh oh!

openshift-ci-robot commented Sep 7, 2022

Uh oh!

mandre commented Jul 24, 2023

Uh oh!

openshift-cherrypick-robot commented Jul 24, 2023

Uh oh!

mandre commented Jul 24, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants