Merge pull request opendatahub-io#116 from gmfrasca/bugfix-sample-pipeline-images

openshift-merge-robot · web-flow · commit 1902227dbf84 · 2023-05-15T17:19:13.000-04:00
Fix sample pipeline images
diff --git a/config/internal/apiserver/sample-config.yaml.tmpl b/config/internal/apiserver/sample-config.yaml.tmpl
@@ -11,7 +11,7 @@ data:
         [
           {
             "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",
+            "description": "[source code](https://github.com/opendatahub-io/data-science-pipelines/tree/master/samples/iris-sklearn) A simple pipeline to demonstrate a basic ML Training workflow",
             "file": "/samples/iris-pipeline-compiled.yaml"
           }
         ]
diff --git a/config/internal/apiserver/sample-pipeline.yaml.tmpl b/config/internal/apiserver/sample-pipeline.yaml.tmpl
@@ -151,19 +151,19 @@ data:
                     _parsed_args = vars(_parser.parse_args())
 
                     _outputs = data_prep(**_parsed_args)
-                  image: image-registry.openshift-image-registry.svc:5000/openshift/python:latest
+                  image: registry.access.redhat.com/ubi8/python-38
                   env:
                   - name: ORIG_PR_NAME
                     valueFrom:
                       fieldRef:
                         fieldPath: metadata.labels['custom.tekton.dev/originalPipelineRun']
-                - image: busybox
+                - image: registry.access.redhat.com/ubi8/ubi-minimal
                   name: output-taskrun-name
                   command:
                   - sh
                   - -ec
                   - echo -n "$(context.taskRun.name)" > "$(results.taskrun-name.path)"
-                - image: busybox
+                - image: registry.access.redhat.com/ubi8/ubi-minimal
                   name: copy-results-artifacts
                   command:
                   - sh
@@ -292,7 +292,7 @@ data:
                     _parsed_args = vars(_parser.parse_args())
 
                     _outputs = train_model(**_parsed_args)
-                  image: image-registry.openshift-image-registry.svc:5000/openshift/python:latest
+                  image: registry.access.redhat.com/ubi8/python-38
                   env:
                   - name: ORIG_PR_NAME
                     valueFrom:
@@ -440,7 +440,7 @@ data:
                     _parsed_args = vars(_parser.parse_args())
 
                     _outputs = evaluate_model(**_parsed_args)
-                  image: image-registry.openshift-image-registry.svc:5000/openshift/python:latest
+                  image: registry.access.redhat.com/ubi8/python-38
                   env:
                   - name: ORIG_PR_NAME
                     valueFrom:
@@ -520,7 +520,7 @@ data:
                     _parsed_args = vars(_parser.parse_args())
 
                     _outputs = validate_model(**_parsed_args)
-                  image: image-registry.openshift-image-registry.svc:5000/openshift/python:latest
+                  image: registry.access.redhat.com/ubi8/python-38
                   env:
                   - name: ORIG_PR_NAME
                     valueFrom:
diff --git a/controllers/testdata/declarative/case_2/expected/created/sample-config.yaml.tmpl b/controllers/testdata/declarative/case_2/expected/created/sample-config.yaml.tmpl
@@ -11,7 +11,7 @@ data:
         [
           {
             "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",
+            "description": "[source code](https://github.com/opendatahub-io/data-science-pipelines/tree/master/samples/iris-sklearn) A simple pipeline to demonstrate a basic ML Training workflow",
             "file": "/samples/iris-pipeline-compiled.yaml"
           }
         ]
diff --git a/controllers/testdata/declarative/case_2/expected/created/sample-pipeline.yaml.tmpl b/controllers/testdata/declarative/case_2/expected/created/sample-pipeline.yaml.tmpl
@@ -151,19 +151,19 @@ data:
                     _parsed_args = vars(_parser.parse_args())
 
                     _outputs = data_prep(**_parsed_args)
-                  image: image-registry.openshift-image-registry.svc:5000/openshift/python:latest
+                  image: registry.access.redhat.com/ubi8/python-38
                   env:
                   - name: ORIG_PR_NAME
                     valueFrom:
                       fieldRef:
                         fieldPath: metadata.labels['custom.tekton.dev/originalPipelineRun']
-                - image: busybox
+                - image: registry.access.redhat.com/ubi8/ubi-minimal
                   name: output-taskrun-name
                   command:
                   - sh
                   - -ec
                   - echo -n "$(context.taskRun.name)" > "$(results.taskrun-name.path)"
-                - image: busybox
+                - image: registry.access.redhat.com/ubi8/ubi-minimal
                   name: copy-results-artifacts
                   command:
                   - sh
@@ -292,7 +292,7 @@ data:
                     _parsed_args = vars(_parser.parse_args())
 
                     _outputs = train_model(**_parsed_args)
-                  image: image-registry.openshift-image-registry.svc:5000/openshift/python:latest
+                  image: registry.access.redhat.com/ubi8/python-38
                   env:
                   - name: ORIG_PR_NAME
                     valueFrom:
@@ -440,7 +440,7 @@ data:
                     _parsed_args = vars(_parser.parse_args())
 
                     _outputs = evaluate_model(**_parsed_args)
-                  image: image-registry.openshift-image-registry.svc:5000/openshift/python:latest
+                  image: registry.access.redhat.com/ubi8/python-38
                   env:
                   - name: ORIG_PR_NAME
                     valueFrom:
@@ -520,7 +520,7 @@ data:
                     _parsed_args = vars(_parser.parse_args())
 
                     _outputs = validate_model(**_parsed_args)
-                  image: image-registry.openshift-image-registry.svc:5000/openshift/python:latest
+                  image: registry.access.redhat.com/ubi8/python-38
                   env:
                   - name: ORIG_PR_NAME
                     valueFrom:

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ data:`
`11`	`11`	`[`
`12`	`12`	`{`
`13`	`13`	`"name": "[Demo] iris-training",`
`14`		`- "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",`
	`14`	`+ "description": "[source code](https://github.com/opendatahub-io/data-science-pipelines/tree/master/samples/iris-sklearn) A simple pipeline to demonstrate a basic ML Training workflow",`
`15`	`15`	`"file": "/samples/iris-pipeline-compiled.yaml"`
`16`	`16`	`}`
`17`	`17`	`]`