Add APIServer.EnableSamplePipeline bool to DSPA CRD

- Create new bool .APIServer.EnableSamplePipeline. Default: true
- Conditionnally include custom SamplePipeline if bool is set to true

Author: gmfrasca

api/v1alpha1/dspipeline_types.go

@@ -76,6 +76,9 @@ type APIServer struct {
 	EnableRoute bool `json:"enableOauth"`
 	// +kubebuilder:default:=true
 	// +kubebuilder:validation:Optional
+	EnableSamplePipeline bool `json:"enableSamplePipeline"`
+	// +kubebuilder:default:=true
+	// +kubebuilder:validation:Optional
 	AutoUpdatePipelineDefaultVersion bool                  `json:"autoUpdatePipelineDefaultVersion"`
 	Resources                        *ResourceRequirements `json:"resources,omitempty"`
 }

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

@@ -72,6 +72,9 @@ spec:
                   enableOauth:
                     default: true
                     type: boolean
+                  enableSamplePipeline:
+                    default: true
+                    type: boolean
                   image:
                     type: string
                   injectDefaultScript:

config/internal/apiserver/deployment.yaml.tmpl

@@ -190,22 +190,25 @@ spec:
               memory: {{.APIServer.Resources.Limits.Memory}}
               {{ end }}
             {{ end }}
+          {{ if .APIServer.EnableSamplePipeline }}
           volumeMounts:
             - name: sample-config
               mountPath: /config/sample_config.json
               subPath: sample_config.json
             - name: sample-pipeline
               mountPath: /samples/
+          {{ end }}
       serviceAccountName: ds-pipeline-{{.Name}}
       volumes:
         - name: proxy-tls
           secret:
             secretName: ds-pipelines-proxy-tls-{{.Name}}
-        # TODO: encap in if-exists block
+        {{ if .APIServer.EnableSamplePipeline }}
         - name: sample-config
           configMap:
             name: sample-config-{{.Name}}
         - name: sample-pipeline
           configMap:
             name: sample-pipeline-{{.Name}}
+        {{ end }}
 

controllers/apiserver.go

@@ -19,6 +19,7 @@ import (
 	"context"
 	dspav1alpha1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1alpha1"
 	v1 "github.com/openshift/api/route/v1"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 )
 
@@ -33,14 +34,19 @@ var apiServerTemplates = []string{
 	"apiserver/service.yaml.tmpl",
 	"apiserver/deployment.yaml.tmpl",
 	"apiserver/monitor.yaml.tmpl",
-	"apiserver/sample-config.yaml.tmpl",
-	"apiserver/sample-pipeline.yaml.tmpl",
 }
 
 // serverRoute is a resource deployed conditionally
 // as such it is handled separately
 const serverRoute = "apiserver/route.yaml.tmpl"
 
+// Sample Pipeline and Config are resources deployed conditionally
+// as such it is handled separately
+var samplePipelineTemplates = map[string]string{
+	"sample-pipeline": "apiserver/sample-pipeline.yaml.tmpl",
+	"sample-config":   "apiserver/sample-config.yaml.tmpl",
+}
+
 func (r *DSPAReconciler) ReconcileAPIServer(ctx context.Context, dsp *dspav1alpha1.DataSciencePipelinesApplication, params *DSPAParams) error {
 
 	if !dsp.Spec.APIServer.Deploy {
@@ -71,6 +77,22 @@ func (r *DSPAReconciler) ReconcileAPIServer(ctx context.Context, dsp *dspav1alph
 		}
 	}
 
+	for cmName, template := range samplePipelineTemplates {
+		if dsp.Spec.APIServer.EnableSamplePipeline {
+			err := r.Apply(dsp, params, template)
+			if err != nil {
+				return err
+			}
+		} else {
+			cm := &corev1.ConfigMap{}
+			namespacedNamed := types.NamespacedName{Name: cmName + "-" + dsp.Name, Namespace: dsp.Namespace}
+			err := r.DeleteResourceIfItExists(ctx, cm, namespacedNamed)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
 	r.Log.Info("Finished applying APIServer Resources")
 	return nil
 }