search

rh-ecosystem-edge / kernel-module-management

The kernel module management operator builds, signs and loads kernel modules on OpenShift.
https://openshift-kmm.netlify.app
Apache License 2.0
26 stars 16 forks source link

Cherry-picking error for `32b71825e516fa6b7cce8c763f31bc3415a7224c` #695

Closed github-actions[bot] closed 1 year ago

github-actions[bot] commented 1 year ago

gitstream tried to cherry-pick commit 32b71825e516fa6b7cce8c763f31bc3415a7224c from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.

Commit message:

Replacing Jobs with Pods in the building/signing features. (#504)

We are not using any of the Job's features and we are reconciling the
operator artifacts (jobs/pods) anyway, so it is better to reconcile pods
directly.

Signed-off-by: Yoni Bettan <yonibettan@gmail.com>

Please cherry-pick the commit manually.

Error:

could not cherry-pick: error running git: exit status 1

Command: /usr/bin/git cherry-pick -n 32b71825e516fa6b7cce8c763f31bc3415a7224c -m1

Output ``` Auto-merging ci/prow/e2e-hub-spoke-incluster-build CONFLICT (content): Merge conflict in ci/prow/e2e-hub-spoke-incluster-build Auto-merging ci/prow/e2e-incluster-build CONFLICT (content): Merge conflict in ci/prow/e2e-incluster-build Auto-merging cmd/manager-hub/main.go CONFLICT (content): Merge conflict in cmd/manager-hub/main.go Auto-merging cmd/manager/main.go CONFLICT (content): Merge conflict in cmd/manager/main.go Auto-merging config/rbac-hub/role.yaml CONFLICT (content): Merge conflict in config/rbac-hub/role.yaml Auto-merging config/rbac/role.yaml CONFLICT (content): Merge conflict in config/rbac/role.yaml Auto-merging controllers/hub/managedclustermodule_reconciler.go CONFLICT (content): Merge conflict in controllers/hub/managedclustermodule_reconciler.go Auto-merging controllers/module_nmc_reconciler.go CONFLICT (content): Merge conflict in controllers/module_nmc_reconciler.go Auto-merging controllers/module_reconciler.go CONFLICT (content): Merge conflict in controllers/module_reconciler.go Auto-merging controllers/module_reconciler_test.go Auto-merging controllers/preflightvalidation_reconciler.go CONFLICT (content): Merge conflict in controllers/preflightvalidation_reconciler.go Auto-merging docs/mkdocs/documentation/deploy_kmod.md Auto-merging docs/mkdocs/documentation/hub_spoke.md Auto-merging docs/mkdocs/documentation/module_loader_image.md CONFLICT (content): Merge conflict in docs/mkdocs/documentation/module_loader_image.md Auto-merging docs/mkdocs/documentation/preflight_validation.md CONFLICT (content): Merge conflict in docs/mkdocs/documentation/preflight_validation.md Auto-merging internal/api/moduleloaderdata.go Auto-merging internal/build/job/mock_maker.go CONFLICT (rename/rename): internal/build/job/mock_maker.go renamed to internal/build/ocpbuild/mock_maker.go in HEAD and to internal/build/pod/mock_maker.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Auto-merging internal/build/job/suite_test.go CONFLICT (rename/rename): internal/build/job/suite_test.go renamed to pkg/mcproducer/suite_test.go in HEAD and to internal/build/pod/suite_test.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). CONFLICT (rename/delete): internal/build/job/maker.go renamed to internal/build/pod/maker.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/build/pod/maker.go deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/build/pod/maker.go left in tree. CONFLICT (rename/delete): internal/build/job/maker_test.go renamed to internal/build/pod/maker_test.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/build/pod/maker_test.go deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/build/pod/maker_test.go left in tree. CONFLICT (rename/delete): internal/build/job/manager.go renamed to internal/build/pod/manager.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/build/pod/manager.go deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/build/pod/manager.go left in tree. CONFLICT (rename/delete): internal/build/job/manager_test.go renamed to internal/build/pod/manager_test.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/build/pod/manager_test.go deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/build/pod/manager_test.go left in tree. Auto-merging internal/cluster/cluster.go Auto-merging internal/constants/constants.go CONFLICT (content): Merge conflict in internal/constants/constants.go Auto-merging internal/filter/filter.go CONFLICT (content): Merge conflict in internal/filter/filter.go Auto-merging internal/filter/filter_test.go CONFLICT (rename/delete): internal/sign/job/manager_test.go renamed to internal/sign/pod/manager_test.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/sign/pod/manager_test.go deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/sign/pod/manager_test.go left in tree. CONFLICT (rename/delete): internal/sign/job/mock_signer.go renamed to internal/sign/pod/mock_signer.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/sign/pod/mock_signer.go deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/sign/pod/mock_signer.go left in tree. CONFLICT (rename/delete): internal/sign/job/signer.go renamed to internal/sign/pod/signer.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/sign/pod/signer.go deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/sign/pod/signer.go left in tree. CONFLICT (rename/delete): internal/sign/job/signer_test.go renamed to internal/sign/pod/signer_test.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/sign/pod/signer_test.go deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/sign/pod/signer_test.go left in tree. CONFLICT (rename/delete): internal/sign/job/suite_test.go renamed to internal/sign/pod/suite_test.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/sign/pod/suite_test.go deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/sign/pod/suite_test.go left in tree. CONFLICT (rename/delete): internal/sign/job/templates/Dockerfile.gotmpl renamed to internal/sign/pod/templates/Dockerfile.gotmpl in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/sign/pod/templates/Dockerfile.gotmpl deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/sign/pod/templates/Dockerfile.gotmpl left in tree. CONFLICT (rename/delete): internal/utils/jobhelper_test.go renamed to internal/utils/podhelper_test.go in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)), but deleted in HEAD. CONFLICT (modify/delete): internal/utils/podhelper_test.go deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of internal/utils/podhelper_test.go left in tree. Auto-merging internal/utils/suite_test.go CONFLICT (modify/delete): support/kmm.spec.yaml deleted in HEAD and modified in 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)). Version 32b71825 (Replacing Jobs with Pods in the building/signing features. (#504)) of support/kmm.spec.yaml left in tree. error: could not apply 32b71825... Replacing Jobs with Pods in the building/signing features. (#504) hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' ```

Upstream-Commit: 32b71825e516fa6b7cce8c763f31bc3415a7224c

ybettan commented 1 year ago

/close This change is replacing the job implementation with pod implementation. In this repo we are using OCP builds instead of jobs so there is nothing to change here as we are not planing to move from builds to pods for now.

openshift-ci[bot] commented 1 year ago

@ybettan: Closing this issue.

In response to [this](https://github.com/rh-ecosystem-edge/kernel-module-management/issues/695#issuecomment-1686239412): >/close >This change is replacing the `job` implementation with `pod` implementation. >In this repo we are using OCP `builds` instead of `jobs` so there is nothing to change here as we are not planing to move from `builds` to `pods` for now. Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
ybettan commented 1 year ago

/reopen

openshift-ci[bot] commented 1 year ago

@ybettan: Reopened this issue.

In response to [this](https://github.com/rh-ecosystem-edge/kernel-module-management/issues/695#issuecomment-1686244077): >/reopen Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
ybettan commented 1 year ago

/close not-planned

openshift-ci[bot] commented 1 year ago

@ybettan: Closing this issue, marking it as "Not Planned".

In response to [this](https://github.com/rh-ecosystem-edge/kernel-module-management/issues/695#issuecomment-1686244630): >/close not-planned Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.