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.

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

oc adm catalog mirror updates: mac/windows, bundle image support, quay.io support #384

Merged
merged 6 commits into from Apr 14, 2020

Conversation

ecordell
Copy link
Contributor

@ecordell ecordell commented Apr 8, 2020

This simplifies and improves the mirroring support in oc adm catalog mirror.

  1. operator-registry is bumped to a version compatible with kube 1.18 client-go
  2. The mirror command is no longer linux-only
  3. The mirror command will now mirror "bundle images" in addition to operator/related images.
  4. The mirror command supports quay.io as a target
    • Images are given a tag when mirroring if they don't already have one
    • Specify DEST as a quay.io org, and the image will be renamed for quay (1 path component for org, the rest converted to a repo name).

Example:

$ oc adm catalog mirror quay.io/operator-framework/upstream-community-operators:latest quay.io/my-org

will generate mappings like
quay.io/coreos/prometheus-operator@sha256:3daa69a8c6c2f1d35dcf1fe48a7cd8b230e55f5229a1ded438f687debade5bcf -> quay.io/my-org/coreos-prometheus-operator:1ebe036a

@ecordell ecordell force-pushed the oc-mirror-quay branch 6 times, most recently from 649a5d4 to 279ab12 Compare April 10, 2020 17:10
@ecordell
Copy link
Contributor Author

/test unit

@ecordell ecordell force-pushed the oc-mirror-quay branch 2 times, most recently from c7feb1d to 20196ac Compare April 10, 2020 20:07
@ecordell
Copy link
Contributor Author

/retest

2 similar comments
@ecordell
Copy link
Contributor Author

/retest

@ecordell
Copy link
Contributor Author

/retest

Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

I'd expect the following set of commits in this PR:

  1. UPSTREAM: <drop>: drop operator-registry patch dropping that carry patch
  2. bump operator-registry
  3. move mirroring from operator-registry to oc <- will this get us closer to dropping the operator-registry dep?
  4. updates to mirroring
  5. bump to pick up sqlite dep
  6. generated changes

pkg/cli/admin/catalog/mirror_options.go Show resolved Hide resolved
deps.diff Show resolved Hide resolved
contrib/completions/zsh/oc Show resolved Hide resolved
pkg/cli/admin/catalog/mirror.go Outdated Show resolved Hide resolved
pkg/cli/admin/catalog/mirror.go Outdated Show resolved Hide resolved
pkg/cli/admin/catalog/mirror.go Outdated Show resolved Hide resolved
pkg/cli/admin/catalog/mirror.go Outdated Show resolved Hide resolved
@ecordell
Copy link
Contributor Author

move mirroring from operator-registry to oc <- will this get us closer to dropping the operator-registry dep?

Yes it will - we're actually fine to remove oc adm catalog build at any time, which will remove operator-registry entirely as a dependency. I can start the deprecation process by marking that command as deprecated now?

@ecordell
Copy link
Contributor Author

@soltysh updated and matches your suggested commit splitting

allow mapping into a single namespace

this supports quay.io which doesn't allow nested paths for images
and doesn't allow creating orgs via push

make the number of path components configuration for catalog mirror

defaults to 2, which is what quay.io requires
@soltysh
Copy link
Member

soltysh commented Apr 14, 2020

Yes it will - we're actually fine to remove oc adm catalog build at any time, which will remove operator-registry entirely as a dependency. I can start the deprecation process by marking that command as deprecated now?

Yes - please.

Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ecordell, soltysh

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 14, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@ecordell
Copy link
Contributor Author

/cherry-pick release-4.4

@openshift-cherrypick-robot

@ecordell: #384 failed to apply on top of branch "release-4.4":

Using index info to reconstruct a base tree...
A	deps.diff
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: bump operator-framework/operator-registry
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.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_bsd.go
A	vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go
M	vendor/golang.org/x/sys/unix/syscall_darwin.go
M	vendor/golang.org/x/sys/unix/syscall_darwin_386.go
M	vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
A	vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go
M	vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
M	vendor/golang.org/x/sys/unix/syscall_darwin_arm64.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_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_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/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_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_darwin_386.1_11.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.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_arm.1_11.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s
M	vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.1_11.go
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_dragonfly_amd64.go
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_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_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/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/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_ppc64.go.git/rebase-apply/patch:1739: trailing whitespace.
    
.git/rebase-apply/patch:1769: trailing whitespace.
> 
.git/rebase-apply/patch:1776: trailing whitespace.
< 
.git/rebase-apply/patch:8217: trailing whitespace.
	  SELECT DISTINCT operatorbundle.csv 
.git/rebase-apply/patch:8313: trailing whitespace.
	  SELECT replaces, skips 
warning: squelched 30 whitespace errors
warning: 35 lines add whitespace errors.

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/windows/security_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
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
Auto-merging vendor/golang.org/x/sys/windows/security_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/security_windows.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_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/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/zsyscall_openbsd_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_netbsd_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_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
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_freebsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.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_arm64.1_11.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.1_11.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/zsyscall_darwin_amd64.1_11.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.1_11.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsyscall_darwin_386.1_11.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_x86_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_mipsnnle_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_mipsnn_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zptrace_armnn_linux.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_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/syscall_openbsd.go
CONFLICT (content): Merge conflict in 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_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_mipsx.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux_mips64x.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
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd.go
CONFLICT (content): Merge conflict in 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
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go deleted in HEAD and modified in bump operator-framework/operator-registry. Version bump operator-framework/operator-registry of vendor/golang.org/x/sys/unix/syscall_darwin_arm.1_11.go left in tree.
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
CONFLICT (modify/delete): vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go deleted in HEAD and modified in bump operator-framework/operator-registry. Version bump operator-framework/operator-registry of vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go left in tree.
Auto-merging vendor/golang.org/x/sys/unix/syscall_bsd.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
Removing vendor/github.com/operator-framework/operator-registry/pkg/sqlite/image.go
Removing vendor/github.com/operator-framework/operator-registry/pkg/mirror/options.go
Removing vendor/github.com/operator-framework/operator-registry/pkg/mirror/mirror.go
Removing vendor/github.com/operator-framework/operator-registry/pkg/containertools/labelreader.go
Removing vendor/github.com/operator-framework/operator-registry/pkg/containertools/imagereader.go
Removing vendor/github.com/operator-framework/operator-registry/pkg/containertools/getimagedata_options.go
Removing vendor/github.com/operator-framework/operator-registry/pkg/containertools/dockerfilegenerator.go
Removing vendor/github.com/operator-framework/operator-registry/pkg/containertools/command.go
Removing vendor/github.com/gorilla/mux/context.go
Removing vendor/github.com/gorilla/mux/ISSUE_TEMPLATE.md
Removing vendor/github.com/gorilla/mux/.travis.yml
Auto-merging vendor/github.com/containerd/continuity/fs/stat_linuxopenbsd.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.
Patch failed at 0002 bump operator-framework/operator-registry

In response to this:

/cherry-pick release-4.4

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants