-
Notifications
You must be signed in to change notification settings - Fork 252
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
Remove k8s dependency to circumvent recursive import #783
Conversation
@dcantah Could you please add a little more details to the PR about the issue and the general description of the fix? It will be easier to review this with some more context. |
@katiewasnothere My bad. I didn't realize that the issue was linked here. Thanks. |
Will update the commit msg to link to the relevant issue/reason for the pr :) |
I'm confused why we see so many changes in |
@kevpar correct, except the last step was running go mod tidy. |
Why is gogo/protobuf updated to an unreleased version as part of this change? |
* kubernetes/kubernetes#87420 * This is to fix the above issue regarding the recursive dependency of kubernetes importing the shim and the shim importing kubernetes when all we used it for was the cri package (and the fact it's only used for tests). * Use k8s.io/cri-api for tests instead of k8s.io/kubernetes/pkg/kubelet/apis/cri * Bump gogo/protobuf version to 1.3.1 and grpc to 1.23.1 Signed-off-by: Daniel Canter <dcanter@microsoft.com>
@jstarks looks like |
@kevpar Yep, we talked about this earlier today but I forgot to answer it here as well so thank you! |
This resolves #760. |
Have you validated that the tests still pass with this change? |
@kevpar yep! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
containers/storage@v1.23.7 is imported by containers/image@v5.9.0, which imports Microsoft/hcsshim@v0.8.9, which imports kubernetes/kubernetes, which is not recommended for any consumer of Kubernetes and its subproject libraries. This was fixed in microsoft/hcsshim#783, so let's pull in a newer version of containers/image that reflects this change. Ultimately, this was _rediscovered_ when we replaced the verify dependencies script in kubernetes/kubernetes with sigs.k8s.io/zeitgeist, which imports k/release. Signed-off-by: Stephen Augustus <foo@auggie.dev>
containers/storage@v1.23.7 is imported by containers/image@v5.9.0, which imports Microsoft/hcsshim@v0.8.9, which imports kubernetes/kubernetes, which is not recommended for any consumer of Kubernetes and its subproject libraries. This was fixed in microsoft/hcsshim#783, so let's pull in a newer version of containers/image that reflects this change. Ultimately, this was _rediscovered_ when we replaced the verify dependencies script in kubernetes/kubernetes with sigs.k8s.io/zeitgeist, which imports k/release. Signed-off-by: Stephen Augustus <foo@auggie.dev>
ZTP must produce MachineConfig resources with ignition version v3.2.0 Since openshift/machine-config-operator#3814, MCO writes v3.4.0 ignition configuration. openshift/machine-config-operator@63d7be1 is the commit just before the culprit one. Also, machine-config-operator@63d7be1ef18b86826b47c61172c7a9dc7c2b6de1 has a transitive dependency to `github.com/Microsoft/hcsshim@v0.8.7` that cause a `go mod tidy` error: ``` github.com/Microsoft/hcsshim@v0.8.7 requires k8s.io/kubernetes@v1.13.0 requires k8s.io/endpointslice@v0.0.0: reading k8s.io/endpointslice/go.mod at revision v0.0.0: unknown revision v0.0.0 ``` which is fixed in v0.8.8 by microsoft/hcsshim#783 Signed-off-by: Andrea Panattoni <apanatto@redhat.com>
ZTP must produce MachineConfig resources with ignition version v3.2.0 Since openshift/machine-config-operator#3814, MCO writes v3.4.0 ignition configuration. openshift/machine-config-operator@63d7be1 is the commit just before the culprit one. Also, machine-config-operator@63d7be1ef18b86826b47c61172c7a9dc7c2b6de1 has a transitive dependency to `github.com/Microsoft/hcsshim@v0.8.7` that cause a `go mod tidy` error: ``` github.com/Microsoft/hcsshim@v0.8.7 requires k8s.io/kubernetes@v1.13.0 requires k8s.io/endpointslice@v0.0.0: reading k8s.io/endpointslice/go.mod at revision v0.0.0: unknown revision v0.0.0 ``` which is fixed in v0.8.8 by microsoft/hcsshim#783 Signed-off-by: Andrea Panattoni <apanatto@redhat.com>
ZTP must produce MachineConfig resources with ignition version v3.2.0 Since openshift/machine-config-operator#3814, MCO writes v3.4.0 ignition configuration. openshift/machine-config-operator@63d7be1 is the commit just before the culprit one. Also, machine-config-operator@63d7be1ef18b86826b47c61172c7a9dc7c2b6de1 has a transitive dependency to `github.com/Microsoft/hcsshim@v0.8.7` that cause a `go mod tidy` error: ``` github.com/Microsoft/hcsshim@v0.8.7 requires k8s.io/kubernetes@v1.13.0 requires k8s.io/endpointslice@v0.0.0: reading k8s.io/endpointslice/go.mod at revision v0.0.0: unknown revision v0.0.0 ``` which is fixed in v0.8.8 by microsoft/hcsshim#783 Signed-off-by: Andrea Panattoni <apanatto@redhat.com>
Signed-off-by: Daniel Canter dcanter@microsoft.com