From 20859efd68f1e2e482f433ea6feabf221a521d6e Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Wed, 30 Oct 2024 12:57:07 +0100 Subject: [PATCH] update: remove dsp with v1(tekton)backend related code (#1281) (#492) * update: remove dsp with v1(tekton)backend related code - images - tekton rbac - descriptions --------- (cherry picked from commit 133b710d4308fb48857df833627eb77265485227) Signed-off-by: Wen Zhou Co-authored-by: Humair Khan --- .../rhods-operator.clusterserviceversion.yaml | 18 +++---------- .../datasciencepipelines.go | 27 +++++++------------ config/rbac/role.yaml | 12 --------- .../datasciencecluster/kubebuilder_rbac.go | 4 --- docs/api-overview.md | 2 +- 5 files changed, 14 insertions(+), 49 deletions(-) diff --git a/bundle/manifests/rhods-operator.clusterserviceversion.yaml b/bundle/manifests/rhods-operator.clusterserviceversion.yaml index 779935958e2..b7799cc7fbc 100644 --- a/bundle/manifests/rhods-operator.clusterserviceversion.yaml +++ b/bundle/manifests/rhods-operator.clusterserviceversion.yaml @@ -181,7 +181,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/red-hat-data-services/rhods-operator support: Red Hat OpenShift AI - name: rhods-operator.v2.15.0 + name: rhods-operator.v2.16.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -580,12 +580,6 @@ spec: - patch - update - watch - - apiGroups: - - custom.tekton.dev - resources: - - pipelineloops - verbs: - - '*' - apiGroups: - dashboard.opendatahub.io resources: @@ -1112,12 +1106,6 @@ spec: - delete - get - patch - - apiGroups: - - tekton.dev - resources: - - '*' - verbs: - - '*' - apiGroups: - template.openshift.io resources: @@ -1261,7 +1249,7 @@ spec: - Data Science links: - name: Red Hat OpenShift AI - url: https://docs.redhat.com/en/documentation/red_hat_openshift_ai_self-managed/2.15.0 + url: https://docs.redhat.com/en/documentation/red_hat_openshift_ai_self-managed/2.16.0 maintainers: - email: managed-open-data-hub@redhat.com name: Red Hat Openshift AI @@ -1269,7 +1257,7 @@ spec: minKubeVersion: 1.25.0 provider: name: Red Hat - version: 2.15.0 + version: 2.16.0 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/components/datasciencepipelines/datasciencepipelines.go b/components/datasciencepipelines/datasciencepipelines.go index 388b54bd707..7370351d4ea 100644 --- a/components/datasciencepipelines/datasciencepipelines.go +++ b/components/datasciencepipelines/datasciencepipelines.go @@ -1,5 +1,5 @@ // Package datasciencepipelines provides utility functions to config Data Science Pipelines: -// Pipeline solution for end to end MLOps workflows that support the Kubeflow Pipelines SDK, Tekton and Argo Workflows. +// Pipeline solution for end to end MLOps workflows that support the Kubeflow Pipelines SDK and Argo Workflows. // +groupName=datasciencecluster.opendatahub.io package datasciencepipelines @@ -73,22 +73,15 @@ func (d *DataSciencePipelines) ReconcileComponent(ctx context.Context, ) error { l := d.ConfigComponentLogger(logger, ComponentName, dscispec) var imageParamMap = map[string]string{ - // v1 - "IMAGES_APISERVER": "RELATED_IMAGE_ODH_ML_PIPELINES_API_SERVER_IMAGE", - "IMAGES_ARTIFACT": "RELATED_IMAGE_ODH_ML_PIPELINES_ARTIFACT_MANAGER_IMAGE", - "IMAGES_PERSISTENTAGENT": "RELATED_IMAGE_ODH_ML_PIPELINES_PERSISTENCEAGENT_IMAGE", - "IMAGES_SCHEDULEDWORKFLOW": "RELATED_IMAGE_ODH_ML_PIPELINES_SCHEDULEDWORKFLOW_IMAGE", - "IMAGES_CACHE": "RELATED_IMAGE_ODH_ML_PIPELINES_CACHE_IMAGE", - "IMAGES_DSPO": "RELATED_IMAGE_ODH_DATA_SCIENCE_PIPELINES_OPERATOR_CONTROLLER_IMAGE", - // v2 - "IMAGESV2_ARGO_APISERVER": "RELATED_IMAGE_ODH_ML_PIPELINES_API_SERVER_V2_IMAGE", - "IMAGESV2_ARGO_PERSISTENCEAGENT": "RELATED_IMAGE_ODH_ML_PIPELINES_PERSISTENCEAGENT_V2_IMAGE", - "IMAGESV2_ARGO_SCHEDULEDWORKFLOW": "RELATED_IMAGE_ODH_ML_PIPELINES_SCHEDULEDWORKFLOW_V2_IMAGE", - "IMAGESV2_ARGO_ARGOEXEC": "RELATED_IMAGE_ODH_DATA_SCIENCE_PIPELINES_ARGO_ARGOEXEC_IMAGE", - "IMAGESV2_ARGO_WORKFLOWCONTROLLER": "RELATED_IMAGE_ODH_DATA_SCIENCE_PIPELINES_ARGO_WORKFLOWCONTROLLER_IMAGE", - "V2_DRIVER_IMAGE": "RELATED_IMAGE_ODH_ML_PIPELINES_DRIVER_IMAGE", - "V2_LAUNCHER_IMAGE": "RELATED_IMAGE_ODH_ML_PIPELINES_LAUNCHER_IMAGE", - "IMAGESV2_ARGO_MLMDGRPC": "RELATED_IMAGE_ODH_MLMD_GRPC_SERVER_IMAGE", + "IMAGES_DSPO": "RELATED_IMAGE_ODH_DATA_SCIENCE_PIPELINES_OPERATOR_CONTROLLER_IMAGE", + "IMAGES_APISERVER": "RELATED_IMAGE_ODH_ML_PIPELINES_API_SERVER_V2_IMAGE", + "IMAGES_PERSISTENCEAGENT": "RELATED_IMAGE_ODH_ML_PIPELINES_PERSISTENCEAGENT_V2_IMAGE", + "IMAGES_SCHEDULEDWORKFLOW": "RELATED_IMAGE_ODH_ML_PIPELINES_SCHEDULEDWORKFLOW_V2_IMAGE", + "IMAGES_ARGO_EXEC": "RELATED_IMAGE_ODH_DATA_SCIENCE_PIPELINES_ARGO_ARGOEXEC_IMAGE", + "IMAGES_ARGO_WORKFLOWCONTROLLER": "RELATED_IMAGE_ODH_DATA_SCIENCE_PIPELINES_ARGO_WORKFLOWCONTROLLER_IMAGE", + "IMAGES_DRIVER": "RELATED_IMAGE_ODH_ML_PIPELINES_DRIVER_IMAGE", + "IMAGES_LAUNCHER": "RELATED_IMAGE_ODH_ML_PIPELINES_LAUNCHER_IMAGE", + "IMAGES_MLMDGRPC": "RELATED_IMAGE_ODH_MLMD_GRPC_SERVER_IMAGE", } enabled := d.GetManagementState() == operatorv1.Managed diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 3fb283a0036..4a5e50630c4 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -319,12 +319,6 @@ rules: - patch - update - watch -- apiGroups: - - custom.tekton.dev - resources: - - pipelineloops - verbs: - - '*' - apiGroups: - dashboard.opendatahub.io resources: @@ -851,12 +845,6 @@ rules: - delete - get - patch -- apiGroups: - - tekton.dev - resources: - - '*' - verbs: - - '*' - apiGroups: - template.openshift.io resources: diff --git a/controllers/datasciencecluster/kubebuilder_rbac.go b/controllers/datasciencecluster/kubebuilder_rbac.go index 36ead7c0ca3..c049f15ddcb 100644 --- a/controllers/datasciencecluster/kubebuilder_rbac.go +++ b/controllers/datasciencecluster/kubebuilder_rbac.go @@ -52,8 +52,6 @@ package datasciencecluster // +kubebuilder:rbac:groups="template.openshift.io",resources=templates,verbs=* -// +kubebuilder:rbac:groups="tekton.dev",resources=*,verbs=* - // +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshots,verbs=create;delete;patch;get // +kubebuilder:rbac:groups="serving.kserve.io",resources=trainedmodels/status,verbs=update;patch;delete;get @@ -151,8 +149,6 @@ package datasciencecluster // +kubebuilder:rbac:groups="extensions",resources=replicasets,verbs=* // +kubebuilder:rbac:groups="extensions",resources=ingresses,verbs=list;watch;patch;delete;get -// +kubebuilder:rbac:groups="custom.tekton.dev",resources=pipelineloops,verbs=* - // +kubebuilder:rbac:groups="core",resources=services/finalizers,verbs=create;delete;list;update;watch;patch;get // +kubebuilder:rbac:groups="core",resources=services,verbs=get;create;watch;update;patch;list;delete // +kubebuilder:rbac:groups="core",resources=services,verbs=* diff --git a/docs/api-overview.md b/docs/api-overview.md index eb6b38f3237..501739b0a6c 100644 --- a/docs/api-overview.md +++ b/docs/api-overview.md @@ -126,7 +126,7 @@ _Appears in:_ ## datasciencecluster.opendatahub.io/datasciencepipelines Package datasciencepipelines provides utility functions to config Data Science Pipelines: -Pipeline solution for end to end MLOps workflows that support the Kubeflow Pipelines SDK, Tekton and Argo Workflows. +Pipeline solution for end to end MLOps workflows that support the Kubeflow Pipelines SDK and Argo Workflows.