Skip to content

Commit

Permalink
update: remove dsp with v1(tekton)backend related code (red-hat-data-…
Browse files Browse the repository at this point in the history
…services#1281) (red-hat-data-services#492)

* update: remove dsp with v1(tekton)backend related code

- images
- tekton rbac
- descriptions

---------
(cherry picked from commit 133b710)

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
Co-authored-by: Humair Khan <HumairAK@users.noreply.github.com>
  • Loading branch information
zdtsw and HumairAK authored Oct 30, 2024
1 parent f4fbfe1 commit 20859ef
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 49 deletions.
18 changes: 3 additions & 15 deletions bundle/manifests/rhods-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down Expand Up @@ -580,12 +580,6 @@ spec:
- patch
- update
- watch
- apiGroups:
- custom.tekton.dev
resources:
- pipelineloops
verbs:
- '*'
- apiGroups:
- dashboard.opendatahub.io
resources:
Expand Down Expand Up @@ -1112,12 +1106,6 @@ spec:
- delete
- get
- patch
- apiGroups:
- tekton.dev
resources:
- '*'
verbs:
- '*'
- apiGroups:
- template.openshift.io
resources:
Expand Down Expand Up @@ -1261,15 +1249,15 @@ 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
maturity: stable
minKubeVersion: 1.25.0
provider:
name: Red Hat
version: 2.15.0
version: 2.16.0
webhookdefinitions:
- admissionReviewVersions:
- v1
Expand Down
27 changes: 10 additions & 17 deletions components/datasciencepipelines/datasciencepipelines.go
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -319,12 +319,6 @@ rules:
- patch
- update
- watch
- apiGroups:
- custom.tekton.dev
resources:
- pipelineloops
verbs:
- '*'
- apiGroups:
- dashboard.opendatahub.io
resources:
Expand Down Expand Up @@ -851,12 +845,6 @@ rules:
- delete
- get
- patch
- apiGroups:
- tekton.dev
resources:
- '*'
verbs:
- '*'
- apiGroups:
- template.openshift.io
resources:
Expand Down
4 changes: 0 additions & 4 deletions controllers/datasciencecluster/kubebuilder_rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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=*
Expand Down
2 changes: 1 addition & 1 deletion docs/api-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.



Expand Down

0 comments on commit 20859ef

Please sign in to comment.