Create DevTools in DSPA CR, Add Database/Storage Secret Creation

api/v1alpha1/dspipeline_types.go

@@ -35,6 +35,9 @@ type DSPASpec struct {
 	*MlPipelineUI `json:"mlpipelineUI"`
 	// +kubebuilder:validation:Required
 	*ObjectStorage `json:"objectStorage"`
+	// DevTools enables non-production tools and utilities for Data Science Pipelines Operator developers
+	// +kubebuilder:validation:Optional
+	*DevTools `json:"devtools"`
 }
 
 type APIServer struct {
@@ -164,6 +167,15 @@ type Minio 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.

config/crd/bases/datasciencepipelinesapplications.opendatahub.io_datasciencepipelinesapplications.yaml

@@ -235,6 +235,17 @@ 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
               mlpipelineUI:
                 properties:
                   configMap:

controllers/database.go

@@ -26,7 +26,6 @@ var dbTemplates = []string{
 	"mariadb/pvc.yaml.tmpl",
 	"mariadb/sa.yaml.tmpl",
 	"mariadb/service.yaml.tmpl",
-	"mariadb/secret.yaml.tmpl",
 }
 
 func (r *DSPAReconciler) ReconcileDatabase(ctx context.Context, dsp *dspav1alpha1.DataSciencePipelinesApplication,

controllers/developer_tools.go

@@ -0,0 +1,53 @@
+/*
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package controllers
+
+import (
+	dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1"
+)
+
+const dbSecret = "devtools/database.secret.yaml.tmpl"
+const storageSecret = "devtools/storage.secret.yaml.tmpl"
+
+func (r *DSPAReconciler) ReconcileDevtools(dsp *dspav1alpha1.DataSciencePipelinesApplication, params *DSPAParams) error {
+
+	log := r.Log.WithValues("namespace", dsp.Namespace).WithValues("dspa_name", dsp.Name)
+
+	if dsp.Spec.DevTools != nil {
+		log.Info("Applying DevTool Resources")
+
+		dbSecretEnabled := dsp.Spec.DevTools.EnableDatabaseSecret
+		storageSecretEnabled := dsp.Spec.DevTools.EnableStorageSecret
+
+		if dbSecretEnabled {
+			log.Info("Database secret creation requested")
+			err := r.Apply(dsp, params, dbSecret)
+			if err != nil {
+				return err
+			}
+		}
+
+		if storageSecretEnabled {
+			log.Info("Object Storage secret creation requested")
+			err := r.Apply(dsp, params, storageSecret)
+			if err != nil {
+				return err
+			}
+		}
+		log.Info("Finished applying DevTool Resources")
+	}
+	return nil
+}

controllers/dspipeline_controller.go

@@ -278,6 +278,11 @@ func (r *DSPAReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		return ctrl.Result{}, err
 	}
 
+	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)

controllers/dspipeline_params.go

@@ -46,6 +46,7 @@ type DSPAParams struct {
 	MlPipelineUI         *dspa.MlPipelineUI
 	MariaDB              *dspa.MariaDB
 	Minio                *dspa.Minio
+	DevTools             *dspa.DevTools
 	DBConnection
 	ObjectStorageConnection
 }
@@ -360,6 +361,7 @@ func (p *DSPAParams) ExtractParams(ctx context.Context, dsp *dspa.DataSciencePip
 	p.MlPipelineUI = dsp.Spec.MlPipelineUI.DeepCopy()
 	p.MariaDB = dsp.Spec.MariaDB.DeepCopy()
 	p.Minio = dsp.Spec.Minio.DeepCopy()
+	p.DevTools = dsp.Spec.DevTools.DeepCopy()
 	p.OAuthProxy = config.GetStringConfigWithDefault(config.OAuthProxyImagePath, config.DefaultImageValue)
 
 	// TODO: If p.<component> is nil we should create defaults

controllers/storage.go

@@ -26,7 +26,6 @@ var storageTemplates = []string{
 	"minio/deployment.yaml.tmpl",
 	"minio/pvc.yaml.tmpl",
 	"minio/service.yaml.tmpl",
-	"minio/secret.yaml.tmpl",
 }
 
 // ReconcileStorage will set up Storage Connection.

controllers/testdata/declarative/case_3/deploy/02_cr.yaml

@@ -34,3 +34,6 @@ spec:
   mlpipelineUI:
     deploy: false
     image: frontend:test3
+  devtools:
+    enableDatabaseSecret: true
+    enableStorageSecret: true