[release-4.7] Bug 1937375: only override deployment resources when explicitly defined in subscription config

[joelanford]

This is a manual cherry-pick of #2010

[openshift-ci-robot]

@joelanford: This pull request references Bugzilla bug 1937375, 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.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.7.z) matches configured target release for branch (4.7.z)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
• dependent bug Bugzilla bug 1926893 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
• dependent Bugzilla bug 1926893 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
• bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

[release-4.7] Bug 1937375: only override deployment resources when explicitly defined in subscription config

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.

[openshift-ci-robot]

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: jianzhangbjz.

Note that only operator-framework members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@joelanford: This pull request references Bugzilla bug 1937375, 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.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.7.z) matches configured target release for branch (4.7.z)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
• dependent bug Bugzilla bug 1926893 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
• dependent Bugzilla bug 1926893 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
• bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

[release-4.7] Bug 1937375: only override deployment resources when explicitly defined in subscription config

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.

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.

[joelanford]

Seems to be failing because the operator-framework/api commit that this PR requires pulls in controller-runtime v0.8.0, which requires go1.15+.

[joelanford]

/retest

[joelanford]

/retest

[joelanford]

/retest

[joelanford]

/retest

[timflannagan]

/lgtm

[kevinrizza]

/approve

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelanford, kevinrizza

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:

• OWNERS [kevinrizza]

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

[openshift-bot]

/retest

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

[timflannagan]

@joelanford Looks like something was pushed recently to the release-4.7 branch and now requires a rebase.

[joelanford]

/test unit

[timflannagan]

/lgtm

[openshift-bot]

/retest

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

[openshift-ci-robot]

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

• operator-framework/operator-lifecycle-manager#2036

Bugzilla bug 1937375 has been moved to the MODIFIED state.

In response to this:

[release-4.7] Bug 1937375: only override deployment resources when explicitly defined in subscription config

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.

[joelanford]

/cherry-pick release-4.6

[openshift-cherrypick-robot]

@joelanford: #2036 failed to apply on top of branch "release-4.6":

Applying: only override deployment resources when explicitly defined in subscription.spec.config
Using index info to reconstruct a base tree...
M	Makefile
M	go.mod
M	go.sum
A	pkg/controller/operators/olm/overrides/inject/inject.go
A	pkg/controller/operators/olm/overrides/inject/inject_test.go
M	test/e2e/subscription_e2e_test.go
A	vendor/github.com/operator-framework/api/crds/operators.coreos.com_operatorconditions.yaml
M	vendor/github.com/operator-framework/api/crds/zz_defs.go
A	vendor/github.com/operator-framework/api/pkg/operators/v1/operatorcondition_types.go
M	vendor/github.com/operator-framework/api/pkg/validation/errors/error.go
M	vendor/github.com/operator-framework/api/pkg/validation/internal/operatorhub.go
M	vendor/modules.txt
M	vendor/sigs.k8s.io/controller-runtime/go.mod
M	vendor/sigs.k8s.io/controller-runtime/go.sum
M	vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/cache_reader.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers_map.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/client/fake/client.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/client/split.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/controller/controller.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/envtest/webhook.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/log/log.go
A	vendor/sigs.k8s.io/controller-runtime/pkg/manager/client_builder.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/manager/manager.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/predicate/predicate.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/runtime/inject/inject.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/http.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/response.go
M	vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/webhook.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/webhook.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/response.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/response.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/http.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/http.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/runtime/inject/inject.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/predicate/predicate.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/predicate/predicate.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/manager/manager.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/manager/manager.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/manager/internal.go
CONFLICT (modify/delete): vendor/sigs.k8s.io/controller-runtime/pkg/manager/client_builder.go deleted in HEAD and modified in only override deployment resources when explicitly defined in subscription.spec.config. Version only override deployment resources when explicitly defined in subscription.spec.config of vendor/sigs.k8s.io/controller-runtime/pkg/manager/client_builder.go left in tree.
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/log/log.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/log/log.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/envtest/webhook.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/envtest/webhook.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/controller/controller.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/controller/controller.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/client/split.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/client/split.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/client/fake/client.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/client/fake/client.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers_map.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers_map.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/cache_reader.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/cache_reader.go
Auto-merging vendor/sigs.k8s.io/controller-runtime/go.sum
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/go.sum
Auto-merging vendor/sigs.k8s.io/controller-runtime/go.mod
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/controller-runtime/go.mod
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/operator-framework/api/pkg/validation/internal/operatorhub.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/api/pkg/validation/internal/operatorhub.go
Auto-merging vendor/github.com/operator-framework/api/pkg/validation/errors/error.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/api/pkg/validation/errors/error.go
CONFLICT (modify/delete): vendor/github.com/operator-framework/api/pkg/operators/v1/operatorcondition_types.go deleted in HEAD and modified in only override deployment resources when explicitly defined in subscription.spec.config. Version only override deployment resources when explicitly defined in subscription.spec.config of vendor/github.com/operator-framework/api/pkg/operators/v1/operatorcondition_types.go left in tree.
Auto-merging vendor/github.com/operator-framework/api/crds/zz_defs.go
CONFLICT (content): Merge conflict in vendor/github.com/operator-framework/api/crds/zz_defs.go
CONFLICT (modify/delete): vendor/github.com/operator-framework/api/crds/operators.coreos.com_operatorconditions.yaml deleted in HEAD and modified in only override deployment resources when explicitly defined in subscription.spec.config. Version only override deployment resources when explicitly defined in subscription.spec.config of vendor/github.com/operator-framework/api/crds/operators.coreos.com_operatorconditions.yaml left in tree.
Auto-merging test/e2e/subscription_e2e_test.go
Auto-merging pkg/controller/operators/olm/overrides/inject_test.go
Auto-merging pkg/controller/operators/olm/overrides/inject.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 only override deployment resources when explicitly defined in subscription.spec.config
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-4.6

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.