The kernel module management operator builds, signs and loads kernel modules on OpenShift.
Home Page: https://openshift-kmm.netlify.app
License: Apache License 2.0
The Kernel Module Management Operator manages the deployment of out-of-tree kernel modules and associated device plug-ins in Kubernetes. Along with deployment it also manages the lifecycle of the kernel modules for new incoming kernel versions attached to upgrades.
Install the bleeding edge KMM in one command:
oc apply -k https://github.com/rh-ecosystem-edge/kernel-module-management/config/defaultYou can find examples and labs on the documentation website.
![dependabot[bot] avatar](https://avatars.githubusercontent.com/in/29110?v=4 "dependabot[bot]")
![github-actions[bot] avatar](https://avatars.githubusercontent.com/in/15368?v=4 "github-actions[bot]")
gitstream tried to cherry-pick commit 1e9c86cafa20a48059dfb323cb0a0cdca2e802cd from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump github.com/onsi/gomega from 1.20.1 to 1.20.2
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.20.1 to 1.20.2.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.20.1...v1.20.2)
---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 1e9c86cafa20a48059dfb323cb0a0cdca2e802cd -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply 1e9c86c... Bump github.com/onsi/gomega from 1.20.1 to 1.20.2
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 1e9c86c
gitstream tried to cherry-pick commit f5ef6c5986565df1c1ae48e5650e26c9d70aaa9b from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump k8s.io/kubectl from 0.25.0 to 0.25.1 (#74)
Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.25.0 to 0.25.1.
- [Release notes](https://github.com/kubernetes/kubectl/releases)
- [Commits](https://github.com/kubernetes/kubectl/compare/v0.25.0...v0.25.1)
---
updated-dependencies:
- dependency-name: k8s.io/kubectl
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.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 f5ef6c5986565df1c1ae48e5650e26c9d70aaa9b -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply f5ef6c5... Bump k8s.io/kubectl from 0.25.0 to 0.25.1 (#74)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: f5ef6c5
gitstream tried to cherry-pick commit 08195ffde81c5faed3ea3eaa1434c25581cd2a0f from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump k8s.io/klog/v2 from 2.70.1 to 2.80.0 (#30)
Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.70.1 to 2.80.0.
- [Release notes](https://github.com/kubernetes/klog/releases)
- [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md)
- [Commits](https://github.com/kubernetes/klog/compare/v2.70.1...v2.80.0)
---
updated-dependencies:
- dependency-name: k8s.io/klog/v2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.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 08195ffde81c5faed3ea3eaa1434c25581cd2a0f -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply 08195ff... Bump k8s.io/klog/v2 from 2.70.1 to 2.80.0 (#30)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 08195ff
gitstream tried to cherry-pick commit 266466587cd8f3c27084ca6221bf96b62e4942c9 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Use a strings.Builder in Make{Un,}LoadCommand (#46)
This change replaces the many `append` statement with a
`strings.Builder` stream to make the string creation more efficient.
We also use this change to allow loading the firware even when
`Modprobe.Args` is set, as it's not related to how modprobe itself is
invoked.
Signed-off-by: Fabien Dupont <[email protected]>
Signed-off-by: Fabien Dupont <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 266466587cd8f3c27084ca6221bf96b62e4942c9 -m1
Auto-merging internal/daemonset/daemonset.go
CONFLICT (content): Merge conflict in internal/daemonset/daemonset.go
error: could not apply 2664665... Use a strings.Builder in Make{Un,}LoadCommand (#46)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 2664665
gitstream tried to cherry-pick commit 809e889ec87aa30dfa197cad805e815e3e687d52 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Preflight should use PullOptions in image verification (#52)
Since now we have pull options also in kernel mapping and in Spec,
those parameters should now be used in the preflight
image verification
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 809e889ec87aa30dfa197cad805e815e3e687d52 -m1
Auto-merging internal/preflight/preflight.go
CONFLICT (content): Merge conflict in internal/preflight/preflight.go
Auto-merging internal/preflight/preflight_test.go
CONFLICT (content): Merge conflict in internal/preflight/preflight_test.go
Auto-merging internal/registry/mock_registry_api.go
CONFLICT (content): Merge conflict in internal/registry/mock_registry_api.go
Auto-merging internal/registry/registry.go
Auto-merging internal/registry/registry_test.go
error: could not apply 809e889... Preflight should use PullOptions in image verification (#52)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 809e889
gitstream tried to cherry-pick commit 2e6ac24db2ae1695da3edb85bac19fb9658dd0eb from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Adding build option to disable pushes to registry
This PR adds additionl flag to the Build APIs
that allows to configure kaniko flag to either
push the image to registry(once it is build),
or skip the push to registry
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 2e6ac24db2ae1695da3edb85bac19fb9658dd0eb -m1
Auto-merging controllers/module_reconciler.go
CONFLICT (content): Merge conflict in controllers/module_reconciler.go
CONFLICT (modify/delete): internal/build/job/maker.go deleted in HEAD and modified in 2e6ac24 (Adding build option to disable pushes to registry). Version 2e6ac24 (Adding build option to disable pushes to registry) of internal/build/job/maker.go left in tree.
CONFLICT (modify/delete): internal/build/job/maker_test.go deleted in HEAD and modified in 2e6ac24 (Adding build option to disable pushes to registry). Version 2e6ac24 (Adding build option to disable pushes to registry) of internal/build/job/maker_test.go left in tree.
CONFLICT (modify/delete): internal/build/job/manager.go deleted in HEAD and modified in 2e6ac24 (Adding build option to disable pushes to registry). Version 2e6ac24 (Adding build option to disable pushes to registry) of internal/build/job/manager.go left in tree.
CONFLICT (modify/delete): internal/build/job/manager_test.go deleted in HEAD and modified in 2e6ac24 (Adding build option to disable pushes to registry). Version 2e6ac24 (Adding build option to disable pushes to registry) of internal/build/job/manager_test.go left in tree.
CONFLICT (modify/delete): internal/build/job/mock_maker.go deleted in HEAD and modified in 2e6ac24 (Adding build option to disable pushes to registry). Version 2e6ac24 (Adding build option to disable pushes to registry) of internal/build/job/mock_maker.go left in tree.
Auto-merging internal/build/manager.go
CONFLICT (content): Merge conflict in internal/build/manager.go
Auto-merging internal/build/mock_manager.go
CONFLICT (content): Merge conflict in internal/build/mock_manager.go
error: could not apply 2e6ac24... Adding build option to disable pushes to registry
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 2e6ac24
gitstream tried to cherry-pick commit 1175403af293bf742dd2795283c48d8e8e1026f2 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump k8s.io/kubectl from 0.25.1 to 0.25.2 (#84)
Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.25.1 to 0.25.2.
- [Release notes](https://github.com/kubernetes/kubectl/releases)
- [Commits](https://github.com/kubernetes/kubectl/compare/v0.25.1...v0.25.2)
---
updated-dependencies:
- dependency-name: k8s.io/kubectl
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.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 1175403af293bf742dd2795283c48d8e8e1026f2 -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
error: could not apply 1175403... Bump k8s.io/kubectl from 0.25.1 to 0.25.2 (#84)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 1175403
gitstream tried to cherry-pick commit 28a0c110e256b1415ca32590b9c62f73a809a8ee from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Improving some comment on the 'check-commit-count' job. (#69)
Signed-off-by: Yoni Bettan <[email protected]>
Signed-off-by: Yoni Bettan <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 28a0c110e256b1415ca32590b9c62f73a809a8ee -m1
Auto-merging ci/prow/check-commits-count
CONFLICT (content): Merge conflict in ci/prow/check-commits-count
error: could not apply 28a0c11... Improving some comment on the 'check-commit-count' job. (#69)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 28a0c11
gitstream tried to cherry-pick commit e2d88e56d29af7a4759b573f8d79220fb718e346 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Update comments in Makefile with new operator name (#64)
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n e2d88e56d29af7a4759b573f8d79220fb718e346 -m1
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: could not apply e2d88e5... Update comments in Makefile with new operator name (#64)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: e2d88e5
gitstream tried to cherry-pick commit 49d1096b2a9d4497abd70a96a6a42b9140ded256 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Trim plus sign in kernel version (#77)
Google Kubernetes Engine using COS as nodes sets
kernel versions ending in a '+' sign which
breaks KMM as it is not a valid ending
for Kubernetes labelling syntax
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 49d1096b2a9d4497abd70a96a6a42b9140ded256 -m1
Auto-merging controllers/module_reconciler.go
Auto-merging controllers/node_kernel_reconciler.go
CONFLICT (content): Merge conflict in controllers/node_kernel_reconciler.go
Auto-merging controllers/node_kernel_reconciler_test.go
CONFLICT (content): Merge conflict in controllers/node_kernel_reconciler_test.go
error: could not apply 49d1096... Trim plus sign in kernel version (#77)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 49d1096
gitstream tried to cherry-pick commit 629f3ba9012e63efde9cc0e76c3689eeb1476505 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Streamline GitHub Actions. (#39)
Move the build of the manager binary to the unit-tests Prow script.
Remove the linting of the code in favor of the lint Prow script.
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 629f3ba9012e63efde9cc0e76c3689eeb1476505 -m1
Auto-merging ci/prow/lint
CONFLICT (content): Merge conflict in ci/prow/lint
error: could not apply 629f3ba... Streamline GitHub Actions. (#39)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 629f3ba
gitstream tried to cherry-pick commit 1bee938cebaac57b6070b97c3058aaf263fe87f4 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump actions/setup-go from 2 to 3
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 2 to 3.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](https://github.com/actions/setup-go/compare/v2...v3)
---
updated-dependencies:
- dependency-name: actions/setup-go
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 1bee938cebaac57b6070b97c3058aaf263fe87f4 -m1
CONFLICT (modify/delete): .github/workflows/e2e.yaml deleted in HEAD and modified in 1bee938 (Bump actions/setup-go from 2 to 3). Version 1bee938 (Bump actions/setup-go from 2 to 3) of .github/workflows/e2e.yaml left in tree.
CONFLICT (modify/delete): .github/workflows/test-build.yml deleted in HEAD and modified in 1bee938 (Bump actions/setup-go from 2 to 3). Version 1bee938 (Bump actions/setup-go from 2 to 3) of .github/workflows/test-build.yml left in tree.
error: could not apply 1bee938... Bump actions/setup-go from 2 to 3
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 1bee938
We have deployed KMMO commit e899b4c on OCP 4.11. Seeing the following error in kmm-operator-controller-manager logs after deploying module CR. Pls advise, thanks! Can you share some examples or any documentation we can refer to while creating our module CR?
Our module CR looks like this at the moment:
> ---
> apiVersion: kmm.sigs.k8s.io/v1beta1
> kind: Module
> metadata:
> name: intel-dgpu-kmmo
> spec:
> moduleLoader:
> container:
> modprobe:
> moduleName: intel-dgpu-kmmo
> kernelMappings:
> - literal: 4.18.0-372.19.1.el8_6.x86_64
> containerImage: image-registry.openshift-image-registry.svc:5000/default/intel-dgpu-driver-container:4.18.0-372.19.1.el8_6.x86_64
> build:
> pull:
> insecure: true
> push:
> insecure: true
> secrets:
> - name: image-registry-secret
> dockerfile: |
> FROM image-registry.openshift-image-registry.svc:5000/openshift/driver-toolkit:latest
> .......
> selector:
> intel.feature.node.kubernetes.io/gpu: 'true'
Error:
E0914 21:50:02.207291 1 controller.go:326] "msg"="Reconciler error" "error"="failed to handle build for kernel version 4.18.0-372.19.1.el8_6.x86_64: failed to check image existence for kernel 4.18.0-372.19.1.el8_6.x86_64: could not check if the image is available: failed to get pull options for image image-registry.openshift-image-registry.svc:5000/default/intel-dgpu-driver-container:4.18.0-372.19.1.el8_6.x86_64: cannot get keychain from the registry auth getter: could not get the service account's pull secrets: serviceaccounts \"builder\" is forbidden: User \"system:serviceaccount:kmm-operator-system:kmm-operator-controller-manager\" cannot get resource \"serviceaccounts\" in API group \"\" in the namespace \"default\"" "controller"="module" "controllerGroup"="kmm.sigs.k8s.io" "controllerKind"="Module" "module"={"name":"intel-dgpu-kmmo","namespace":"default"} "name"="intel-dgpu-kmmo" "namespace"="default" "reconcileID"="0538c905-bc8a-4a47-80e6-e95ef8bbf2ec"
The latest commit 30925ef is having the above error while deploying KMMO on OCP. The commit prior to this one (74bfa7f) does not have this issue.
[hershpa@jfz1r09h07 kernel-module-management]$ oc apply -k config/default
error: accumulating resources: accumulation err='accumulating resources from '../crd': '/home/hershpa/kernel-module-management/config/crd' must resolve to a file': recursed accumulation of path '/home/hershpa/kernel-module-management/config/crd': accumulating resources: accumulation err='accumulating resources from 'bases/kmm.sigs.k8s.io_preflightvalidations.yaml': yaml: line 24: could not find expected ':'': got file 'kmm.sigs.k8s.io_preflightvalidations.yaml', but '/home/hershpa/kernel-module-management/config/crd/bases/kmm.sigs.k8s.io_preflightvalidations.yaml' must be a directory to be a root
gitstream tried to cherry-pick commit 57eb966277ae93f4cc5581407b4fd3a9f365a457 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Add the -operator suffix to the image name. (#79)
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 57eb966277ae93f4cc5581407b4fd3a9f365a457 -m1
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
CONFLICT (modify/delete): ci/install-ci/kustomization.yaml deleted in HEAD and modified in 57eb966 (Add the -operator suffix to the image name. (#79)). Version 57eb966 (Add the -operator suffix to the image name. (#79)) of ci/install-ci/kustomization.yaml left in tree.
Auto-merging config/manager/kustomization.yaml
CONFLICT (content): Merge conflict in config/manager/kustomization.yaml
error: could not apply 57eb966... Add the -operator suffix to the image name. (#79)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 57eb966
KMMO uses seLinux option spc_t (super privileged container type) for daemonSet which may be over-privileged to insert/remove the OOT kernel modules. We would like to explore if there is a tighter seLinux policy we can use instead. One particular option we would like to try is the user-container-selinux. Is there an interface available in module yaml to try this seLinux policy instead of default spc_t?
Issue Summary:
The DaemonSet does not show up immediately after the driver container build is complete on OCP. It take 10 mins for the DaemonSet to show up. What is the reason for this delay?
Suggested Priority(P1-P3) & Urgent(Urgent, medium, Low):
P1 and medium
gitstream tried to cherry-pick commit 8a500997de386b095e3e69212587ed013c78f1a5 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump k8s.io/client-go from 0.25.0 to 0.25.1 (#71)
Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.25.0 to 0.25.1.
- [Release notes](https://github.com/kubernetes/client-go/releases)
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.25.0...v0.25.1)
---
updated-dependencies:
- dependency-name: k8s.io/client-go
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.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 8a500997de386b095e3e69212587ed013c78f1a5 -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply 8a50099... Bump k8s.io/client-go from 0.25.0 to 0.25.1 (#71)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 8a50099
gitstream tried to cherry-pick commit b94213dc823c145e539b1f3fec6f14a5edc8704f from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Add unit test guidelines in CONRIBUTING.md. (#55)
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n b94213dc823c145e539b1f3fec6f14a5edc8704f -m1
Auto-merging CONTRIBUTING.md
CONFLICT (content): Merge conflict in CONTRIBUTING.md
error: could not apply b94213d... Add unit test guidelines in CONRIBUTING.md. (#55)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: b94213d
gitstream tried to cherry-pick commit af53a373ccef1b2099933dcc7f272c0e822ea4c4 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump github.com/onsi/ginkgo/v2 from 2.1.4 to 2.1.6
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.1.4 to 2.1.6.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/ginkgo/compare/v2.1.4...v2.1.6)
---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n af53a373ccef1b2099933dcc7f272c0e822ea4c4 -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply af53a37... Bump github.com/onsi/ginkgo/v2 from 2.1.4 to 2.1.6
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: af53a37
gitstream tried to cherry-pick commit 5d4174f801f5fb337553c361158cadfb23fbec20 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump github.com/onsi/ginkgo/v2 from 2.1.6 to 2.2.0 (#73)
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.1.6 to 2.2.0.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/ginkgo/compare/v2.1.6...v2.2.0)
---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.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 5d4174f801f5fb337553c361158cadfb23fbec20 -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply 5d4174f... Bump github.com/onsi/ginkgo/v2 from 2.1.6 to 2.2.0 (#73)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 5d4174f
gitstream tried to cherry-pick commit 1b7f0b3e3594f662749af6e2b76b3ffde37aaf16 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Separate PullOption for build process and image verification (#32)
Currently we have pull option in the Build section of the Module API. It is used both
for configuring the pull option passed to the build configuration (kaniko)
and also to the function that verifies images existence (pulling its manifest).
We should separate them into 2 different entities:
1) present in ModuleLoader spec - used for image contents inspection and existence verification
2) present in the Build - used for specifying pull options of the base images of the build process
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 1b7f0b3e3594f662749af6e2b76b3ffde37aaf16 -m1
Auto-merging api/v1beta1/module_types.go
Auto-merging api/v1beta1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in api/v1beta1/zz_generated.deepcopy.go
CONFLICT (modify/delete): ci/module-kmm-ci-build.template.yaml deleted in HEAD and modified in 1b7f0b3 (Separate PullOption for build process and image verification (#32)). Version 1b7f0b3 (Separate PullOption for build process and image verification (#32)) of ci/module-kmm-ci-build.template.yaml left in tree.
Auto-merging config/crd/bases/kmm.sigs.k8s.io_modules.yaml
CONFLICT (content): Merge conflict in config/crd/bases/kmm.sigs.k8s.io_modules.yaml
Auto-merging internal/build/helper.go
CONFLICT (content): Merge conflict in internal/build/helper.go
CONFLICT (modify/delete): internal/build/job/manager.go deleted in HEAD and modified in 1b7f0b3 (Separate PullOption for build process and image verification (#32)). Version 1b7f0b3 (Separate PullOption for build process and image verification (#32)) of internal/build/job/manager.go left in tree.
CONFLICT (modify/delete): internal/build/job/manager_test.go deleted in HEAD and modified in 1b7f0b3 (Separate PullOption for build process and image verification (#32)). Version 1b7f0b3 (Separate PullOption for build process and image verification (#32)) of internal/build/job/manager_test.go left in tree.
Auto-merging internal/build/mock_helper.go
Auto-merging internal/registry/mock_registry_api.go
Auto-merging internal/registry/registry.go
CONFLICT (content): Merge conflict in internal/registry/registry.go
Auto-merging internal/registry/registry_test.go
error: could not apply 1b7f0b3... Separate PullOption for build process and image verification (#32)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 1b7f0b3
gitstream tried to cherry-pick commit f43286da1f56a122b0b4ddb2d8dad7b7c468a65f from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Adding a job that enforce a single commit for each PR.
This job will make sure that all commits in a PR were squashed to a single
commit.
Signed-off-by: Yoni Bettan <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n f43286da1f56a122b0b4ddb2d8dad7b7c468a65f -m1
Auto-merging ci/prow/check-commits-count
CONFLICT (add/add): Merge conflict in ci/prow/check-commits-count
error: could not apply f43286d... Adding a job that enforce a single commit for each PR.
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: f43286d
gitstream tried to cherry-pick commit e7b9300c280aecf320aa2b4224fc965222a35425 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850
Adding build option to disable pushes to registry
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n e7b9300c280aecf320aa2b4224fc965222a35425 -m1
Auto-merging controllers/module_reconciler.go
CONFLICT (content): Merge conflict in controllers/module_reconciler.go
CONFLICT (modify/delete): internal/build/job/maker.go deleted in HEAD and modified in e7b9300 (Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850). Version e7b9300 (Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850) of internal/build/job/maker.go left in tree.
CONFLICT (modify/delete): internal/build/job/maker_test.go deleted in HEAD and modified in e7b9300 (Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850). Version e7b9300 (Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850) of internal/build/job/maker_test.go left in tree.
CONFLICT (modify/delete): internal/build/job/manager.go deleted in HEAD and modified in e7b9300 (Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850). Version e7b9300 (Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850) of internal/build/job/manager.go left in tree.
CONFLICT (modify/delete): internal/build/job/manager_test.go deleted in HEAD and modified in e7b9300 (Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850). Version e7b9300 (Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850) of internal/build/job/manager_test.go left in tree.
CONFLICT (modify/delete): internal/build/job/mock_maker.go deleted in HEAD and modified in e7b9300 (Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850). Version e7b9300 (Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850) of internal/build/job/mock_maker.go left in tree.
Auto-merging internal/build/manager.go
CONFLICT (content): Merge conflict in internal/build/manager.go
Auto-merging internal/build/mock_manager.go
CONFLICT (content): Merge conflict in internal/build/mock_manager.go
error: could not apply e7b9300... Merge pull request #24 from yevgeny-shnaidman/yevgeny/MGMT-11850
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: e7b9300
gitstream tried to cherry-pick commit f518103d10fe449fbf58fbb1cde1df5454855853 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump k8s.io/client-go from 0.25.1 to 0.25.2 (#83)
Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.25.1 to 0.25.2.
- [Release notes](https://github.com/kubernetes/client-go/releases)
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.25.1...v0.25.2)
---
updated-dependencies:
- dependency-name: k8s.io/client-go
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.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 f518103d10fe449fbf58fbb1cde1df5454855853 -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply f518103... Bump k8s.io/client-go from 0.25.1 to 0.25.2 (#83)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: f518103
gitstream tried to cherry-pick commit 54ec19e957fa30e6faf425fb120aadf2e640251e from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
adding build verification to preflight (#65)
In case image of the Module is not available or
is does not contain the correct driver version,
preflight will check if Build configuration exists
in Module yaml, and if it does, then it will try to build it.
In case build is successful, then the module is considered to be verified
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 54ec19e957fa30e6faf425fb120aadf2e640251e -m1
Auto-merging api/v1beta1/preflightvalidation_types.go
Auto-merging config/crd/bases/kmm.sigs.k8s.io_preflightvalidations.yaml
Auto-merging controllers/preflightvalidation_reconciler.go
Auto-merging controllers/preflightvalidation_reconciler_test.go
Auto-merging internal/preflight/mock_preflight_api.go
Auto-merging internal/preflight/preflight.go
CONFLICT (content): Merge conflict in internal/preflight/preflight.go
Auto-merging internal/preflight/preflight_test.go
CONFLICT (content): Merge conflict in internal/preflight/preflight_test.go
Auto-merging internal/registry/registry.go
Auto-merging internal/registry/registry_test.go
Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
error: could not apply 54ec19e... adding build verification to preflight (#65)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 54ec19e
gitstream tried to cherry-pick commit 8389cd18423195b6f8f4258f609a35b30b3ee12e from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Merge pull request #11 from kubernetes-sigs/dependabot/github_actions/actions/setup-go-3
Bump actions/setup-go from 2 to 3
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 8389cd18423195b6f8f4258f609a35b30b3ee12e -m1
CONFLICT (modify/delete): .github/workflows/e2e.yaml deleted in HEAD and modified in 8389cd1 (Merge pull request #11 from kubernetes-sigs/dependabot/github_actions/actions/setup-go-3). Version 8389cd1 (Merge pull request #11 from kubernetes-sigs/dependabot/github_actions/actions/setup-go-3) of .github/workflows/e2e.yaml left in tree.
CONFLICT (modify/delete): .github/workflows/test-build.yml deleted in HEAD and modified in 8389cd1 (Merge pull request #11 from kubernetes-sigs/dependabot/github_actions/actions/setup-go-3). Version 8389cd1 (Merge pull request #11 from kubernetes-sigs/dependabot/github_actions/actions/setup-go-3) of .github/workflows/test-build.yml left in tree.
error: could not apply 8389cd1... Merge pull request #11 from kubernetes-sigs/dependabot/github_actions/actions/setup-go-3
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 8389cd1
gitstream tried to cherry-pick commit 25abfb1861243916a56d7ae4090a19f4afb8cc95 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Fix config/manifests for bundle generation (#60)
This change renames the
`config/manifests/bases/kmm-operator.clusterserviceversion.yaml` file
to `kernel-module-management.clusterserviceversion.yaml`, in order to
fix `make bundle`. The file name must match the `projectName` defined
in the `PROJECT` file, or `operator generate kustomize manifests -q`
will not find it and ask all the questions to generate it.
This change also update some tools to their latest versions:
- update golangci-lint
- update controller-gen
- update kustomize
- update OPM, to include file based catalog creation
https://olm.operatorframework.io/docs/reference/file-based-catalogs/#design
Signed-off-by: Fabien Dupont <[email protected]>
Signed-off-by: Fabien Dupont <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 25abfb1861243916a56d7ae4090a19f4afb8cc95 -m1
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: could not apply 25abfb1... Fix config/manifests for bundle generation (#60)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 25abfb1
gitstream tried to cherry-pick commit fdda3ab779225a8628fc30431c7fde2eec01ac94 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Replacing 'kustomize' binary with 'kubectl kustomize' binary. (#75)
`kustomize` has been embedded in the `kubectl` command, so we can use
`kubectl` in most of the places.
Signed-off-by: Yoni Bettan <[email protected]>
Signed-off-by: Yoni Bettan <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: could not run a command 0 before committing: error while running "go mod tidy": exec: "go": executable file not found in $PATH
Upstream-Commit: fdda3ab
gitstream tried to cherry-pick commit 16da4bb4e3b24e62f640ae9d3958ee455ce50736 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump k8s.io/kubectl from 0.24.4 to 0.25.0 (#15)
Bumps [k8s.io/kubectl](https://github.com/kubernetes/kubectl) from 0.24.4 to 0.25.0.
- [Release notes](https://github.com/kubernetes/kubectl/releases)
- [Commits](https://github.com/kubernetes/kubectl/compare/v0.24.4...v0.25.0)
---
updated-dependencies:
- dependency-name: k8s.io/kubectl
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.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 16da4bb4e3b24e62f640ae9d3958ee455ce50736 -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply 16da4bb... Bump k8s.io/kubectl from 0.24.4 to 0.25.0 (#15)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 16da4bb
gitstream tried to cherry-pick commit e0a5b43cc79dc86a932cf4e222296410db2f906c from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Merge pull request #20 from ybettan/check-commit
Adding a job that enforce a single commit for each PR.
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n e0a5b43cc79dc86a932cf4e222296410db2f906c -m1
Auto-merging ci/prow/check-commits-count
CONFLICT (add/add): Merge conflict in ci/prow/check-commits-count
error: could not apply e0a5b43... Merge pull request #20 from ybettan/check-commit
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: e0a5b43
gitstream tried to cherry-pick commit ded4431b1cb037f5cb24579daa765de736fa7019 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Merge pull request #25 from kubernetes-sigs/dependabot/go_modules/github.com/onsi/gomega-1.20.2
Bump github.com/onsi/gomega from 1.20.1 to 1.20.2
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n ded4431b1cb037f5cb24579daa765de736fa7019 -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply ded4431... Merge pull request #25 from kubernetes-sigs/dependabot/go_modules/github.com/onsi/gomega-1.20.2
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: ded4431
When will FW load feature from upstream [https://github.com/kubernetes-sigs/kernel-module-management/pull/17] be available on downstream KMMO repo for OCP?
gitstream tried to cherry-pick commit 0bde0cedcd2af6c59d094de43c9ba87fcc4dcb31 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Fix typo in unit test guidelines (#57)
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 0bde0cedcd2af6c59d094de43c9ba87fcc4dcb31 -m1
Auto-merging CONTRIBUTING.md
CONFLICT (content): Merge conflict in CONTRIBUTING.md
error: could not apply 0bde0ce... Fix typo in unit test guidelines (#57)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 0bde0ce
gitstream tried to cherry-pick commit 78401c65483f186b1ffb01ffe9b02cf8fc4d4489 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Fixing ci/prow/check-commit-count. (#28)
Prow is cloning the repo using `git clone --mirror ...`.
In addition to that, the changes are directly tested in the `main`
branch, therefore, the only way to get the diff is to add the `upstream`
remote and check the diff against `upstream/main` instead of `main`.
Signed-off-by: Yoni Bettan <[email protected]>
Signed-off-by: Yoni Bettan <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 78401c65483f186b1ffb01ffe9b02cf8fc4d4489 -m1
Auto-merging ci/prow/check-commits-count
CONFLICT (content): Merge conflict in ci/prow/check-commits-count
error: could not apply 78401c6... Fixing ci/prow/check-commit-count. (#28)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 78401c6
gitstream tried to cherry-pick commit ee64914e7ecd6109bbe7ea5d59fb22c68056a787 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Ignore mocks in test coverage report via codecov config (#36)
Codecov is configured to ignore mocks when generating its coverage
report, instead of manually removing mocks from the unit test coverage
report.
- https://docs.codecov.com/docs/codecov-yaml
- https://docs.codecov.com/docs/codecovyml-reference#ignore
Signed-off-by: Michail Resvanis <[email protected]>
Signed-off-by: Michail Resvanis <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n ee64914e7ecd6109bbe7ea5d59fb22c68056a787 -m1
CONFLICT (modify/delete): .github/workflows/test-build.yml deleted in HEAD and modified in ee64914 (Ignore mocks in test coverage report via codecov config (#36)). Version ee64914 (Ignore mocks in test coverage report via codecov config (#36)) of .github/workflows/test-build.yml left in tree.
error: could not apply ee64914... Ignore mocks in test coverage report via codecov config (#36)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: ee64914
gitstream tried to cherry-pick commit 4cedc9e84d655ab56ce561ccfe01c4482bd1c7e5 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Allow changing image's tag when building with kaniko (#29)
Allow the user to configure which image's tag
from kaniko want to use for the building process.
MGMT-11383
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 4cedc9e84d655ab56ce561ccfe01c4482bd1c7e5 -m1
Auto-merging api/v1beta1/module_types.go
CONFLICT (modify/delete): ci/module-kmm-ci-build.template.yaml deleted in HEAD and modified in 4cedc9e (Allow changing image's tag when building with kaniko (#29)). Version 4cedc9e (Allow changing image's tag when building with kaniko (#29)) of ci/module-kmm-ci-build.template.yaml left in tree.
Auto-merging config/crd/bases/kmm.sigs.k8s.io_modules.yaml
CONFLICT (modify/delete): internal/build/job/maker.go deleted in HEAD and modified in 4cedc9e (Allow changing image's tag when building with kaniko (#29)). Version 4cedc9e (Allow changing image's tag when building with kaniko (#29)) of internal/build/job/maker.go left in tree.
CONFLICT (modify/delete): internal/build/job/maker_test.go deleted in HEAD and modified in 4cedc9e (Allow changing image's tag when building with kaniko (#29)). Version 4cedc9e (Allow changing image's tag when building with kaniko (#29)) of internal/build/job/maker_test.go left in tree.
error: could not apply 4cedc9e... Allow changing image's tag when building with kaniko (#29)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 4cedc9e
gitstream tried to cherry-pick commit 860d865b92dcdc557db7327b63bd9db31eb7075a from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Bump k8s.io/client-go from 0.24.4 to 0.25.0 (#14)
Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.24.4 to 0.25.0.
- [Release notes](https://github.com/kubernetes/client-go/releases)
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.24.4...v0.25.0)
---
updated-dependencies:
- dependency-name: k8s.io/client-go
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.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 860d865b92dcdc557db7327b63bd9db31eb7075a -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply 860d865... Bump k8s.io/client-go from 0.24.4 to 0.25.0 (#14)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 860d865
gitstream tried to cherry-pick commit abd27229cb4dfc817f36c31feaadc14899a88942 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Add first document for lab (#23)
Added document with steps and examples
for use with different cloud platforms and clusters.
Please cherry-pick the commit manually.
Error:
could not cherry-pick: could not run a command 0 before committing: error while running "go mod tidy": exec: "go": executable file not found in $PATH
Upstream-Commit: abd2722
gitstream tried to cherry-pick commit 071840d403333dbb8d07d0b1535b8c86d3aa2ad3 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Separate in-cluster build and image existence verification (#33)
This PR removes the image existance verification from
Sync API of the build package and moves it into the
handleBuild function of the module reconcilier(prior
to calling the Sync API)
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 071840d403333dbb8d07d0b1535b8c86d3aa2ad3 -m1
Auto-merging controllers/module_reconciler.go
CONFLICT (content): Merge conflict in controllers/module_reconciler.go
Auto-merging controllers/module_reconciler_test.go
CONFLICT (content): Merge conflict in controllers/module_reconciler_test.go
Auto-merging controllers/node_kernel_reconciler_test.go
CONFLICT (content): Merge conflict in controllers/node_kernel_reconciler_test.go
Auto-merging internal/build/helper.go
CONFLICT (content): Merge conflict in internal/build/helper.go
CONFLICT (modify/delete): internal/build/job/manager.go deleted in HEAD and modified in 071840d (Separate in-cluster build and image existence verification (#33)). Version 071840d (Separate in-cluster build and image existence verification (#33)) of internal/build/job/manager.go left in tree.
CONFLICT (modify/delete): internal/build/job/manager_test.go deleted in HEAD and modified in 071840d (Separate in-cluster build and image existence verification (#33)). Version 071840d (Separate in-cluster build and image existence verification (#33)) of internal/build/job/manager_test.go left in tree.
Auto-merging internal/build/mock_helper.go
Auto-merging internal/module/helper.go
CONFLICT (add/add): Merge conflict in internal/module/helper.go
Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
error: could not apply 071840d... Separate in-cluster build and image existence verification (#33)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 071840d
gitstream tried to cherry-pick commit 2fefd28167d494d1fa759f0671343ce94568f48c from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Add a build CI script. (#45)
Please cherry-pick the commit manually.
Error:
could not cherry-pick: could not run a command 0 before committing: error while running "go mod tidy": exec: "go": executable file not found in $PATH
Upstream-Commit: 2fefd28
gitstream tried to cherry-pick commit b08a55400dd8c42db786a067fac3f8cf8492a845 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Moving authenticator creation to auth package (#42)
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n b08a55400dd8c42db786a067fac3f8cf8492a845 -m1
Auto-merging controllers/module_reconciler.go
CONFLICT (content): Merge conflict in controllers/module_reconciler.go
Auto-merging internal/auth/auth.go
CONFLICT (content): Merge conflict in internal/auth/auth.go
Auto-merging internal/preflight/preflight.go
CONFLICT (content): Merge conflict in internal/preflight/preflight.go
Auto-merging internal/registry/registry.go
CONFLICT (content): Merge conflict in internal/registry/registry.go
error: could not apply b08a554... Moving authenticator creation to auth package (#42)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: b08a554
gitstream tried to cherry-pick commit 4fed69cec74b75c094e73dd168d77cf62cc32aca from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Merge pull request #21 from kubernetes-sigs/dependabot/go_modules/github.com/onsi/ginkgo/v2-2.1.6
Bump github.com/onsi/ginkgo/v2 from 2.1.4 to 2.1.6
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 4fed69cec74b75c094e73dd168d77cf62cc32aca -m1
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
error: could not apply 4fed69c... Merge pull request #21 from kubernetes-sigs/dependabot/go_modules/github.com/onsi/ginkgo/v2-2.1.6
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 4fed69c
gitstream tried to cherry-pick commit 615d50da62dcd976fb9019f590096009cc8bcca6 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Adding 'ybettan' to the OWNERS file. (#59)
Signed-off-by: Yoni Bettan <[email protected]>
Signed-off-by: Yoni Bettan <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 615d50da62dcd976fb9019f590096009cc8bcca6 -m1
Auto-merging OWNERS
CONFLICT (content): Merge conflict in OWNERS
error: could not apply 615d50d... Adding 'ybettan' to the OWNERS file. (#59)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 615d50d
gitstream tried to cherry-pick commit f85061001d201519273c38fef642afa624cf86e3 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Add the CloudBuild config to build images. (#56)
Please cherry-pick the commit manually.
Error:
could not cherry-pick: could not run a command 0 before committing: error while running "go mod tidy": exec: "go": executable file not found in $PATH
Upstream-Commit: f850610
gitstream tried to cherry-pick commit 9b2db6ca2a92548722887f41f245f4860f4a1b8f from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Adding support for image push during preflight build verification (#76)
1) add a field to the Preflight CRD spec , that signifies if customer
wants to push the image during preflight verification
2) add support for image push during preflight Build stage
3) add Generator filter to preflight Watch, to skip being scheduled
on Preflight status changes
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 9b2db6ca2a92548722887f41f245f4860f4a1b8f -m1
Auto-merging api/v1beta1/preflightvalidation_types.go
Auto-merging config/crd/bases/kmm.sigs.k8s.io_modules.yaml
Auto-merging config/crd/bases/kmm.sigs.k8s.io_preflightvalidations.yaml
Auto-merging controllers/preflightvalidation_reconciler.go
CONFLICT (content): Merge conflict in controllers/preflightvalidation_reconciler.go
Auto-merging controllers/preflightvalidation_reconciler_test.go
CONFLICT (content): Merge conflict in controllers/preflightvalidation_reconciler_test.go
Auto-merging internal/filter/filter.go
Auto-merging internal/preflight/mock_preflight_api.go
CONFLICT (content): Merge conflict in internal/preflight/mock_preflight_api.go
Auto-merging internal/preflight/preflight.go
CONFLICT (content): Merge conflict in internal/preflight/preflight.go
Auto-merging internal/preflight/preflight_test.go
CONFLICT (content): Merge conflict in internal/preflight/preflight_test.go
error: could not apply 9b2db6c... Adding support for image push during preflight build verification (#76)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 9b2db6c
gitstream tried to cherry-pick commit 41a479f5a625fa6bc1681ad516e8cad2d1793df5 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Load firmware from the module loader (#17)
It is common for kernel module to come with firmware(s). On immutable
operating systems like CoreOS, the standard firmware path
`/lib/firmware` is read-only. So, we need to let the kernel know where
to lookup firmware file(s).
This change adds the `FirmwarePath` attribute to the `ModprobeSpec`
definition and modify the `MakeLoadCommand` and `MakeUnloadCommand`
methods to leverage it.
It also adds a `Volume` and a `VolumeMount` to expose the
`/var/lib/firmware/<Module.Name>` host directory (created if it doesn't
exist) inside the pod. The `/var/lib/firmware` is [the recommended path
for firmwares in OpenShift with RHCOS
nodes](https://access.redhat.com/documentation/fr-fr/openshift_container_platform/4.10/html-single/post-installation_configuration/index#rhcos-load-firmware-blobs_post-install-machine-configuration-tasks).
Putting the firmware in a `Module.Name` subfolder avoids multiple
Modules to override each others firmware. It also simplifies the
removal of the firmware files.
The `MakeLoadCommand` adds a step to copy the `FirmwarePath` to
`/var/lib/firmware/<Module.Name>` to the `modprobe` command. The
`MakeUnloadCommand` removes the firmware folder previously copied after
unloading the module. The commands use `/usr/bin -c` to allow shell
control like `&&`.
Signed-off-by: Fabien Dupont <[email protected]>
Signed-off-by: Fabien Dupont <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 41a479f5a625fa6bc1681ad516e8cad2d1793df5 -m1
Auto-merging api/v1beta1/module_types.go
Auto-merging config/crd/bases/kmm.sigs.k8s.io_modules.yaml
Auto-merging internal/daemonset/daemonset.go
CONFLICT (content): Merge conflict in internal/daemonset/daemonset.go
Auto-merging internal/daemonset/daemonset_test.go
CONFLICT (content): Merge conflict in internal/daemonset/daemonset_test.go
error: could not apply 41a479f... Load firmware from the module loader (#17)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 41a479f
gitstream tried to cherry-pick commit f7499feba6f2978d897b9b14c93a208b612131eb from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Remove /usr/lib references at DaemonSet (#50)
In most cases shared libraries directory /lib is a dynamic link to
/usr/lib but in some other cases as Ubuntu 18.04 LTS or Debian 11,
those directories have completely different content. In any case
in-tree modules can be found on /lib/modules/KERNEL_VERSION/ so in
order to avoid compatibility issues depending which OS Kubernetes
nodes are running we should stick to /lib as a mount point for
DaemonSet. Also nodeLibModulesPath has been restricted to
/lib/modules/KERNEL_VERSION/.
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n f7499feba6f2978d897b9b14c93a208b612131eb -m1
Auto-merging internal/daemonset/daemonset.go
Auto-merging internal/daemonset/daemonset_test.go
CONFLICT (content): Merge conflict in internal/daemonset/daemonset_test.go
error: could not apply f7499fe... Remove /usr/lib references at DaemonSet (#50)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: f7499fe
Hello, Is there a way to tell the KMMO to remove a certain kernel module before we load ours? In a OOT driver we are currently working on, we need to remove the in tree driver before we load ours. Thanks
To elaborate, in order to insert our OOT graphics driver, we first need to remove in tree drm driver or else the insert will fail. if there no current functionality to do this before insert, a way to run a pre-requisite commands/scripts would be a good idea.
gitstream tried to cherry-pick commit 327d6d874621f5fe3fcd460675a8306e8a08de8a from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Move the codecov config to the root of the repo. (#38)
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 327d6d874621f5fe3fcd460675a8306e8a08de8a -m1
CONFLICT (rename/delete): .github/codecov.yml renamed to codecov.yaml in 327d6d8 (Move the codecov config to the root of the repo. (#38)), but deleted in HEAD.
error: could not apply 327d6d8... Move the codecov config to the root of the repo. (#38)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
Upstream-Commit: 327d6d8
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
Django
The Web framework for perfectionists with deadlines.
Laravel
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
Microsoft
Open source projects and samples from Microsoft.
Google
Google ❤️ Open Source for everyone.
Alibaba
Alibaba Open Source for everyone
D3
Data-Driven Documents codes.
Tencent
China tencent open source team.