Remove DevTools CRD item

- Not useful as Minio/MariaDB params will now generate their secrets automatically if they are missing, so removing before the option hits production and needs to be accounted for in the API
opendatahub-io · Sep 5, 2023 · b8afe43 · b8afe43
1 parent c710fa1
commit b8afe43
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 106 deletions.
diff --git a/api/v1alpha1/dspipeline_types.go b/api/v1alpha1/dspipeline_types.go
@@ -38,9 +38,6 @@ type DSPASpec struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default:={deploy: false}
 	*MLMD `json:"mlmd"`
-	// DevTools enables non-production tools and utilities for Data Science Pipelines Operator developers
-	// +kubebuilder:validation:Optional
-	*DevTools `json:"devtools"`
 }
 
 type APIServer struct {
@@ -205,15 +202,6 @@ type Writer struct {
 	Image string `json:"image"`
 }
 
-type DevTools struct {
-	// +kubebuilder:default:=false
-	// +kubebuilder:validation:Optional
-	EnableDatabaseSecret bool `json:"enableDatabaseSecret"`
-	// +kubebuilder:default:=false
-	// +kubebuilder:validation:Optional
-	EnableStorageSecret bool `json:"enableStorageSecret"`
-}
-
 // ResourceRequirements structures compute resource requirements.
 // Replaces ResourceRequirements from corev1 which also includes optional storage field.
 // We handle storage field separately, and should not include it as a subfield for Resources.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/...ses/datasciencepipelinesapplications.opendatahub.io_datasciencepipelinesapplications.yaml b/...ses/datasciencepipelinesapplications.opendatahub.io_datasciencepipelinesapplications.yaml
@@ -238,17 +238,6 @@ spec:
                         type: string
                     type: object
                 type: object
-              devtools:
-                description: DevTools enables non-production tools and utilities for
-                  Data Science Pipelines Operator developers
-                properties:
-                  enableDatabaseSecret:
-                    default: false
-                    type: boolean
-                  enableStorageSecret:
-                    default: false
-                    type: boolean
-                type: object
               mlmd:
                 default:
                   deploy: false

diff --git a/controllers/developer_tools.go b/controllers/developer_tools.go
diff --git a/controllers/dspipeline_controller.go b/controllers/dspipeline_controller.go
@@ -257,11 +257,6 @@ func (r *DSPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		}
 	}
 
-	err = r.ReconcileDevtools(dspa, params)
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-
 	log.Info("Updating CR status")
 	// Refresh DSPA before updating
 	err = r.Get(ctx, req.NamespacedName, dspa)

diff --git a/controllers/dspipeline_params.go b/controllers/dspipeline_params.go
@@ -48,7 +48,6 @@ type DSPAParams struct {
 	MariaDB              *dspa.MariaDB
 	Minio                *dspa.Minio
 	MLMD                 *dspa.MLMD
-	DevTools             *dspa.DevTools
 	DBConnection
 	ObjectStorageConnection
 }
@@ -402,7 +401,6 @@ func (p *DSPAParams) ExtractParams(ctx context.Context, dsp *dspa.DataSciencePip
 	p.MlPipelineUI = dsp.Spec.MlPipelineUI.DeepCopy()
 	p.MariaDB = dsp.Spec.Database.MariaDB.DeepCopy()
 	p.Minio = dsp.Spec.ObjectStorage.Minio.DeepCopy()
-	p.DevTools = dsp.Spec.DevTools.DeepCopy()
 	p.OAuthProxy = config.GetStringConfigWithDefault(config.OAuthProxyImagePath, config.DefaultImageValue)
 	p.MLMD = dsp.Spec.MLMD.DeepCopy()
 

diff --git a/controllers/testdata/declarative/case_3/deploy/02_cr.yaml b/controllers/testdata/declarative/case_3/deploy/02_cr.yaml
@@ -34,6 +34,3 @@ spec:
   mlpipelineUI:
     deploy: false
     image: frontend:test3
-  devtools:
-    enableDatabaseSecret: true
-    enableStorageSecret: true