diff --git a/README.md b/README.md index ef7f779bd22..a654ad5c434 100644 --- a/README.md +++ b/README.md @@ -319,6 +319,9 @@ spec: managementState: Managed datasciencepipelines: managementState: Managed + managedPipelines: + instructLab: + state: Managed kserve: managementState: Managed nim: diff --git a/controllers/components/datasciencepipelines/datasciencepipelines.go b/controllers/components/datasciencepipelines/datasciencepipelines.go index 193af273398..d9424e6c111 100644 --- a/controllers/components/datasciencepipelines/datasciencepipelines.go +++ b/controllers/components/datasciencepipelines/datasciencepipelines.go @@ -15,6 +15,7 @@ import ( componentApi "github.com/opendatahub-io/opendatahub-operator/v2/apis/components/v1alpha1" dscv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/datasciencecluster/v1" "github.com/opendatahub-io/opendatahub-operator/v2/controllers/status" + "github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster" cr "github.com/opendatahub-io/opendatahub-operator/v2/pkg/componentsregistry" "github.com/opendatahub-io/opendatahub-operator/v2/pkg/deploy" "github.com/opendatahub-io/opendatahub-operator/v2/pkg/metadata/annotations" @@ -38,8 +39,14 @@ func (s *componentHandler) GetManagementState(dsc *dscv1.DataScienceCluster) ope } func (s *componentHandler) Init(_ common.Platform) error { - if err := deploy.ApplyParams(paramsPath, imageParamMap); err != nil { - return fmt.Errorf("failed to update images on path %s: %w", paramsPath, err) + release := cluster.GetRelease() + + extraParams := map[string]string{ + platformVersionParamsKey: release.Version.String(), + } + + if err := deploy.ApplyParams(paramsPath, imageParamMap, extraParams); err != nil { + return fmt.Errorf("failed to apply params on path %s: %w", paramsPath, err) } return nil diff --git a/controllers/components/datasciencepipelines/datasciencepipelines_support.go b/controllers/components/datasciencepipelines/datasciencepipelines_support.go index a5f8e1ffa36..7b2adf9228f 100644 --- a/controllers/components/datasciencepipelines/datasciencepipelines_support.go +++ b/controllers/components/datasciencepipelines/datasciencepipelines_support.go @@ -79,7 +79,6 @@ func computeParamsMap(rr *types.ReconciliationRequest) (map[string]string, error extraParamsMap := map[string]string{ managedPipelineParamsKey: string(data), - platformVersionParamsKey: rr.Release.Version.String(), } return extraParamsMap, nil diff --git a/controllers/components/datasciencepipelines/datasciencepipelines_support_test.go b/controllers/components/datasciencepipelines/datasciencepipelines_support_test.go index de6fbb104e1..836b35658d8 100644 --- a/controllers/components/datasciencepipelines/datasciencepipelines_support_test.go +++ b/controllers/components/datasciencepipelines/datasciencepipelines_support_test.go @@ -50,6 +50,5 @@ func TestComputeParamsMap(t *testing.T) { g.Expect(result).Should(And( HaveKeyWithValue(managedPipelineParamsKey, string(expectedData)), - HaveKeyWithValue(platformVersionParamsKey, v.String()), )) }