Update Unit Tests for EnableSamplePipeline

Author: gmfrasca

config/internal/apiserver/deployment.yaml.tmpl

@@ -211,4 +211,3 @@ spec:
           configMap:
             name: sample-pipeline-{{.Name}}
         {{ end }}
-          

config/internal/apiserver/sample-config.yaml.tmpl

@@ -15,4 +15,3 @@ data:
             "file": "/samples/iris-pipeline-compiled.yaml"
           }
         ]
-

controllers/dspipeline_controller_test.go

@@ -55,7 +55,7 @@ var cases = map[string]TestCase{
 		Path:        "./testdata/deploy/case_2/cr.yaml",
 	},
 	"case_3": {
-		Description: "custom Artifact configmap is provided, custom images override defaults",
+		Description: "custom Artifact configmap is provided, custom images override defaults, no sample pipeline",
 		Path:        "./testdata/deploy/case_3/cr.yaml",
 		AdditionalResources: map[string][]string{
 			SecretKind: {
@@ -110,7 +110,9 @@ var secretsCreated = CaseComponentResources{
 
 var configMapsNotCreated = CaseComponentResources{
 	"case_3": {
-		"apiserver": "./testdata/results/case_3/apiserver/configmap_artifact_script.yaml",
+		"apiserver":                "./testdata/results/case_3/apiserver/configmap_artifact_script.yaml",
+		"apiserver-sampleconfig":   "./testdata/results/case_3/apiserver/sample-config.yaml",
+		"apiserver-samplepipeline": "./testdata/results/case_3/apiserver/sample-pipeline.yaml",
 	},
 }
 

controllers/testdata/deploy/case_2/cr.yaml

@@ -14,6 +14,7 @@ spec:
     injectDefaultScript: true
     stripEOF: true
     enableOauth: true
+    enableSamplePipeline: true
     terminateStatus: Cancelled
     trackArtifacts: true
     dbConfigConMaxLifetimeSec: 125

controllers/testdata/deploy/case_3/cr.yaml

@@ -5,6 +5,7 @@ metadata:
 spec:
   apiServer:
     enableOauth: true
+    enableSamplePipeline: false
     artifactScriptConfigMap:
       name: doesnotexist
       key: "somekey"

controllers/testdata/results/case_0/apiserver/deployment.yaml

@@ -179,9 +179,24 @@ spec:
             limits:
               cpu: 500m
               memory: 1Gi
+          volumeMounts:
+            - mountPath: /config/sample_config.json
+              name: sample-config
+              subPath: sample_config.json
+            - mountPath: /samples/
+              name: sample-pipeline
       volumes:
         - name: proxy-tls
           secret:
             secretName: ds-pipelines-proxy-tls-testdsp0
             defaultMode: 420
+        - configMap:
+            defaultMode: 420
+            name: sample-config-testdsp0
+          name: sample-config
+        - configMap:
+            defaultMode: 420
+            name: sample-pipeline-testdsp0
+          name: sample-pipeline
+
       serviceAccountName: ds-pipeline-testdsp0

controllers/testdata/results/case_2/apiserver/deployment.yaml

@@ -179,9 +179,23 @@ spec:
             limits:
               cpu: 2522m
               memory: 5Gi
+          volumeMounts:
+            - mountPath: /config/sample_config.json
+              name: sample-config
+              subPath: sample_config.json
+            - mountPath: /samples/
+              name: sample-pipeline
       volumes:
         - name: proxy-tls
           secret:
             secretName: ds-pipelines-proxy-tls-testdsp2
             defaultMode: 420
+        - configMap:
+            defaultMode: 420
+            name: sample-config-testdsp2
+          name: sample-config
+        - configMap:
+            defaultMode: 420
+            name: sample-pipeline-testdsp2
+          name: sample-pipeline
       serviceAccountName: ds-pipeline-testdsp2

controllers/testdata/results/case_3/apiserver/sample-config.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+data:
+  sample_config.json: |-
+        [
+          {
+            "name": "[Demo] iris-training",
+            "description": "[source code](https://github.com/opendatahub-io/data-science-pipelines/tree/master/samples/iris-training) A simple pipeline to demonstrate a basic ML Training workflow",
+            "file": "/samples/iris-pipeline-compiled.yaml"
+            "file": "/samples/iris-pipeline-compiled.yaml"
+          }
+        ]
+
+kind: ConfigMap
+metadata:
+  name: sample-config-testdsp3
+  namespace: default

controllers/testdata/results/case_3/apiserver/sample-pipeline.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sample-pipeline-testdsp3
+  namespace: default
+data:
+  sample-pipeline.yaml: |-
+    pipeline: placeholder
+    reason: |-
+      we're not actually checking the contents here,
+      just verifying the CM itself doesn't exist in this test