Always deploy sample config

- enableSampleConfig=false now updates sample config json directly

Signed-off-by: Giulio Frasca <[email protected]>

Author: gmfrasca

config/internal/apiserver/default/deployment.yaml.tmpl

@@ -185,9 +185,7 @@ spec:
           args:
             - --config=/config
             - -logtostderr=true
-            {{ if .APIServer.EnableSamplePipeline }}
             - --sampleconfig=/config/sample_config.json
-            {{ end }}
             {{ if .PodToPodTLS }}
             - --tlsCertPath=/etc/tls/private/tls.crt
             - --tlsCertKeyPath=/etc/tls/private/tls.key
@@ -246,19 +244,15 @@ spec:
             - mountPath: /etc/tls/private
               name: proxy-tls
           {{ end }}
-          {{ if or .APIServer.EnableSamplePipeline .CustomCABundle }}
-            {{ if .APIServer.EnableSamplePipeline }}
             - name: sample-config
               mountPath: /config/sample_config.json
               subPath: sample_config.json
             - name: sample-pipeline
               mountPath: /samples/
-            {{ end }}
             {{ if .CustomCABundle }}
             - mountPath: {{ .CustomCABundleRootMountPath  }}
               name: ca-bundle
             {{ end }}
-          {{ end }}
         {{ if .APIServer.EnableRoute }}
         - name: oauth-proxy
           args:
@@ -330,11 +324,10 @@ spec:
           configMap:
             name: {{ .CustomCABundle.ConfigMapName }}
         {{ end }}
-        {{ if .APIServer.EnableSamplePipeline }}
         - name: sample-config
           configMap:
             name: sample-config-{{.Name}}
         - name: sample-pipeline
           configMap:
             name: sample-pipeline-{{.Name}}
-        {{ end }}
+

controllers/apiserver.go

@@ -25,7 +25,6 @@ import (
 	dspav1 "github.com/opendatahub-io/data-science-pipelines-operator/api/v1"
 	"github.com/opendatahub-io/data-science-pipelines-operator/controllers/config"
 	v1 "github.com/openshift/api/route/v1"
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 )
 
@@ -174,20 +173,10 @@ func (r *DSPAReconciler) ReconcileAPIServer(ctx context.Context, dsp *dspav1.Dat
 		}
 	}
 
-	for cmName, template := range samplePipelineTemplates {
-		//if dsp.Spec.APIServer.EnableSamplePipeline || dsp.Spec.APIServer.ManagedPipelines.EnableIrisPipeline || dsp.Spec.APIServer.ManagedPipelines.EnableInstructLabPipeline {
-		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
-			}
+	for _, template := range samplePipelineTemplates {
+		err := r.Apply(dsp, params, template)
+		if err != nil {
+			return err
 		}
 	}