Skip to content

Commit 54b6832

Browse files
committed
RHOAIENG-9374: specify relative paths for sibling Kubeflow dependencies
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/[email protected] $ idea diff ../common ~/go/pkg/mod/github.com/kubeflow/kubeflow/components/[email protected] ``` diff ../common ~/go/pkg/mod/github.com/kubeflow/kubeflow/components/[email protected] diff ../common/go.mod /home/jdanek/go/pkg/mod/github.com/kubeflow/kubeflow/components/[email protected]/go.mod 3c3 < go 1.19 --- > go 1.12 Only in /home/jdanek/go/pkg/mod/github.com/kubeflow/kubeflow/components/[email protected]: LICENSE Common subdirectories: ../common/reconcilehelper and /home/jdanek/go/pkg/mod/github.com/kubeflow/kubeflow/components/[email protected]/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/[email protected] $ idea diff ../notebook-controller ~/go/pkg/mod/github.com/kubeflow/kubeflow/components/[email protected] 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.
1 parent eacf63c commit 54b6832

File tree

6 files changed

+15
-0
lines changed

6 files changed

+15
-0
lines changed

.github/workflows/notebook_controller_integration_test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- v1.10-branch
88
paths:
99
- .github/workflows/notebook_controller_integration_test.yaml
10+
- components/common/**
1011
- components/notebook-controller/**
1112
workflow_dispatch:
1213

.github/workflows/notebook_controller_unit_test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- v1.10-branch
88
paths:
99
- .github/workflows/notebook_controller_unit_test.yaml
10+
- components/common/**
1011
- components/notebook-controller/**
1112
workflow_dispatch:
1213

.github/workflows/odh_notebook_controller_integration_test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- v1.10-branch
88
paths:
99
- .github/workflows/odh_notebook_controller_integration_test.yaml
10+
- components/common/**
1011
- components/notebook-controller/**
1112
- components/odh-notebook-controller/**
1213
workflow_dispatch:

.github/workflows/odh_notebook_controller_unit_test.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
- v1.10-branch
88
paths:
99
- .github/workflows/odh_notebook_controller_unit_test.yaml
10+
- components/common/**
11+
- components/notebook-controller/**
1012
- components/odh-notebook-controller/**
1113
workflow_dispatch:
1214

components/notebook-controller/go.mod

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,9 @@ require (
7575
sigs.k8s.io/yaml v1.4.0 // indirect
7676
)
7777

78+
// use sibling kubeflow packages from this repo
79+
replace (
80+
github.com/kubeflow/kubeflow/components/common => ../common
81+
)
82+
7883
replace google.golang.org/grpc => google.golang.org/grpc v1.56.3

components/odh-notebook-controller/go.mod

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,9 @@ require (
8888
sigs.k8s.io/yaml v1.4.0 // indirect
8989
)
9090

91+
// use sibling kubeflow packages from this repo
92+
replace (
93+
github.com/kubeflow/kubeflow/components/notebook-controller => ../notebook-controller
94+
)
95+
9196
replace google.golang.org/grpc => google.golang.org/grpc v1.56.3

0 commit comments

Comments
 (0)