RHOAIENG-9374: Specify relative paths for sibling Kubeflow dependencies #358
Conversation
Previously, notebook-controller downloaded kubflow/common from the net, similarly, odh-notebook-controller dowloaded a version of kubeflow/notebook-controller from the net. With this change, all Kubeflow code comes from the components/ directory in this repo. This gives us more control over the Kubeflow code we use. --- # Reconciling changes ## kubeflow/components/common $ go install golang.org/dl/go1.20.14@latest $ ~/go/bin/go1.20.14 download kubeflow/components/notebook-controller$ ~/go/bin/go1.20.14 get github.com/kubeflow/kubeflow/components/common@v0.0.0-20220218084159-4ad0158e955e $ idea diff ../common ~/go/pkg/mod/github.com/kubeflow/kubeflow/components/common@v0.0.0-20220218084159-4ad0158e955e ``` diff ../common ~/go/pkg/mod/github.com/kubeflow/kubeflow/components/common@v0.0.0-20220218084159-4ad0158e955e diff ../common/go.mod /home/jdanek/go/pkg/mod/github.com/kubeflow/kubeflow/components/common@v0.0.0-20220218084159-4ad0158e955e/go.mod 3c3 < go 1.19 --- > go 1.12 Only in /home/jdanek/go/pkg/mod/github.com/kubeflow/kubeflow/components/common@v0.0.0-20220218084159-4ad0158e955e: LICENSE Common subdirectories: ../common/reconcilehelper and /home/jdanek/go/pkg/mod/github.com/kubeflow/kubeflow/components/common@v0.0.0-20220218084159-4ad0158e955e/reconcilehelpe ``` There are no meaningful differences, so no changes necessary. Great. ## kubeflow/components/notebook-controller kubeflow/components/odh-notebook-controller$ ~/go/bin/go1.20.14 get github.com/kubeflow/kubeflow/components/notebook-controller@v0.0.0-20220728153354-fc09bd1eefb8 $ idea diff ../notebook-controller ~/go/pkg/mod/github.com/kubeflow/kubeflow/components/notebook-controller@v0.0.0-20220728153354-fc09bd1eefb8 Looking at the usages, it seems clear to me that we want to use what's in our repo in components/notebook-controller/pkg/culler. This is because odh-notebook-controller only imports culler to get at `culler.STOP_ANNOTATION`. This constant is the same in both versions. Therefore, also no further changes are needed.
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
jiridanek
force-pushed
the
jd_go_mod_relative
branch
from
1cedfd5
to
cdbbfdd
Compare
|
I had a look, so far I could not even find description of the symptoms what broke there. |
@jiridanek , here is the following discussion as it took place in slack, |
jiridanek
changed the title
|
putting this on-hold, pending further refinement and planning in jira https://issues.redhat.com/browse/RHOAIENG-9374 |
|
No need to close, keep the PR open, let's try to triage and get some time for the merge |
https://issues.redhat.com/browse/RHOAIENG-9374
Description
Previously, notebook-controller downloaded kubflow/common from the net. Similarly, odh-notebook-controller dowloaded a version of kubeflow/notebook-controller from the net. With this change, all Kubeflow code comes from the components/ directory in this repo.
This gives us more control over the Kubeflow code we use.
Reconciling changes
kubeflow/components/common
There are no meaningful differences, so no changes necessary. Great.
kubeflow/components/notebook-controller
Looking at the usages, it seems clear to me that we want to use what's in our repo in components/notebook-controller/pkg/culler.
This is because odh-notebook-controller only imports culler to get at
culler.STOP_ANNOTATION. This constant is the same in both versions.In addition, we have two new fields in Notebook status that the previously referenced upstream notebook-controller code did not have,
Therefore, also no further changes should be needed.
How Has This Been Tested?
You tell me whether you are even willing to consider this PR and what's required ;P
Merge criteria: