Skip to content

Commit

Permalink
Rename PreloadedPipelines to ManagedPipelines
Browse files Browse the repository at this point in the history
  • Loading branch information
@lburgazzoli
lburgazzoli committed Jan 29, 2025
1 parent a99f8ae commit b9ff986
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 50 deletions.
6 changes: 3 additions & 3 deletions apis/components/v1alpha1/datasciencepipelines/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ package datasciencepipelines

import operatorv1 "github.com/openshift/api/operator/v1"

type PreloadedPipelinesSpec struct {
type ManagedPipelinesSpec struct {
// Configures whether to automatically import the InstructLab pipeline.
// You must enable the trainingoperator component to run the InstructLab pipeline.
InstructLab PreloadedPipelineOptions `json:"instructLab,omitempty"`
InstructLab ManagedPipelineOptions `json:"instructLab,omitempty"`
}

type PreloadedPipelineOptions struct {
type ManagedPipelineOptions struct {
// Set to one of the following values:
//
// - "Managed" : This pipeline is automatically imported.
Expand Down
16 changes: 8 additions & 8 deletions apis/components/v1alpha1/datasciencepipelines/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/components/v1alpha1/datasciencepipelines_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ type DataSciencePipelinesSpec struct {

type DataSciencePipelinesCommonSpec struct {
common.DevFlagsSpec `json:",inline"`
PreloadedPipelines datasciencepipelines.PreloadedPipelinesSpec `json:"preloadedPipelines,omitempty"`
PreloadedPipelines datasciencepipelines.ManagedPipelinesSpec `json:"managedPipelines,omitempty"`
}

// DataSciencePipelinesCommonStatus defines the shared observed state of DataSciencePipelines
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/components.platform.opendatahub.io_datasciencepipelines.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
type: object
type: array
type: object
preloadedPipelines:
managedPipelines:
properties:
instructLab:
description: |-
Expand Down
30 changes: 15 additions & 15 deletions bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,21 +172,7 @@ spec:
type: object
type: array
type: object
managementState:
description: |-
Set to one of the following values:
- "Managed" : the operator is actively managing the component and trying to keep it active.
It will only upgrade the component if it is safe to do so
- "Removed" : the operator is actively managing the component and will not install it,
or if it is installed, the operator will try to remove it
enum:
- Managed
- Removed
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
preloadedPipelines:
managedPipelines:
properties:
instructLab:
description: |-
Expand All @@ -207,6 +193,20 @@ spec:
type: string
type: object
type: object
managementState:
description: |-
Set to one of the following values:
- "Managed" : the operator is actively managing the component and trying to keep it active.
It will only upgrade the component if it is safe to do so
- "Removed" : the operator is actively managing the component and will not install it,
or if it is installed, the operator will try to remove it
enum:
- Managed
- Removed
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
kserve:
description: |-
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/components.platform.opendatahub.io_datasciencepipelines.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
type: object
type: array
type: object
preloadedPipelines:
managedPipelines:
properties:
instructLab:
description: |-
Expand Down
30 changes: 15 additions & 15 deletions config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,21 +172,7 @@ spec:
type: object
type: array
type: object
managementState:
description: |-
Set to one of the following values:
- "Managed" : the operator is actively managing the component and trying to keep it active.
It will only upgrade the component if it is safe to do so
- "Removed" : the operator is actively managing the component and will not install it,
or if it is installed, the operator will try to remove it
enum:
- Managed
- Removed
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
preloadedPipelines:
managedPipelines:
properties:
instructLab:
description: |-
Expand All @@ -207,6 +193,20 @@ spec:
type: string
type: object
type: object
managementState:
description: |-
Set to one of the following values:
- "Managed" : the operator is actively managing the component and trying to keep it active.
It will only upgrade the component if it is safe to do so
- "Removed" : the operator is actively managing the component and will not install it,
or if it is installed, the operator will try to remove it
enum:
- Managed
- Removed
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
kserve:
description: |-
Expand Down
2 changes: 1 addition & 1 deletion controllers/components/datasciencepipelines/datasciencepipelines_support_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestComputeParamsMap(t *testing.T) {
dsp := componentApi.DataSciencePipelines{
Spec: componentApi.DataSciencePipelinesSpec{
DataSciencePipelinesCommonSpec: componentApi.DataSciencePipelinesCommonSpec{
PreloadedPipelines: datasciencepipelines.PreloadedPipelinesSpec{},
PreloadedPipelines: datasciencepipelines.ManagedPipelinesSpec{},
},
},
}
Expand Down
6 changes: 3 additions & 3 deletions docs/api-overview.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ _Appears in:_
| --- | --- | --- | --- |
| `managementState` _[ManagementState](#managementstate)_ | Set to one of the following values:<br /><br />- "Managed" : the operator is actively managing the component and trying to keep it active.<br /> It will only upgrade the component if it is safe to do so<br /><br />- "Removed" : the operator is actively managing the component and will not install it,<br /> or if it is installed, the operator will try to remove it | | Enum: [Managed Removed] <br /> |
| `devFlags` _[DevFlags](#devflags)_ | Add developer fields | | |
| `preloadedPipelines` _[PreloadedPipelinesSpec](#preloadedpipelinesspec)_ | | | |
| `managedPipelines` _[ManagedPipelinesSpec](#managedpipelinesspec)_ | | | |


#### DSCDataSciencePipelinesStatus
Expand Down Expand Up @@ -662,7 +662,7 @@ _Appears in:_
| Field | Description | Default | Validation |
| --- | --- | --- | --- |
| `devFlags` _[DevFlags](#devflags)_ | Add developer fields | | |
| `preloadedPipelines` _[PreloadedPipelinesSpec](#preloadedpipelinesspec)_ | | | |
| `managedPipelines` _[ManagedPipelinesSpec](#managedpipelinesspec)_ | | | |


#### DataSciencePipelinesCommonStatus
Expand Down Expand Up @@ -713,7 +713,7 @@ _Appears in:_
| Field | Description | Default | Validation |
| --- | --- | --- | --- |
| `devFlags` _[DevFlags](#devflags)_ | Add developer fields | | |
| `preloadedPipelines` _[PreloadedPipelinesSpec](#preloadedpipelinesspec)_ | | | |
| `managedPipelines` _[ManagedPipelinesSpec](#managedpipelinesspec)_ | | | |


#### DataSciencePipelinesStatus
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/helper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ func setupDSCInstance(name string) *dscv1.DataScienceCluster {
ManagementState: operatorv1.Removed,
},
DataSciencePipelinesCommonSpec: componentApi.DataSciencePipelinesCommonSpec{
PreloadedPipelines: datasciencepipelines.PreloadedPipelinesSpec{
InstructLab: datasciencepipelines.PreloadedPipelineOptions{
PreloadedPipelines: datasciencepipelines.ManagedPipelinesSpec{
InstructLab: datasciencepipelines.ManagedPipelineOptions{
State: operatorv1.Removed,
},
},
Expand Down

0 comments on commit b9ff986

Please sign in to comment.