RHOAIENG-20569: Fix the ImageStream manifests with the correct software versions

jstourac · jstourac · commit df03d9fb0f61 · 2025-02-27T11:46:47.000+01:00
diff --git a/manifests/base/jupyter-datascience-notebook-imagestream.yaml b/manifests/base/jupyter-datascience-notebook-imagestream.yaml
@@ -63,7 +63,7 @@ spec:
           [
             {"name": "Boto3", "version": "1.34"},
             {"name": "Kafka-Python", "version": "2.0"},
-            {"name": "Kfp", "version": "2.8"},
+            {"name": "Kfp", "version": "2.11"},
             {"name": "Matplotlib", "version": "3.8"},
             {"name": "Numpy", "version": "1.26"},
             {"name": "Pandas", "version": "2.2"},
diff --git a/manifests/base/jupyter-pytorch-notebook-imagestream.yaml b/manifests/base/jupyter-pytorch-notebook-imagestream.yaml
@@ -72,7 +72,7 @@ spec:
             {"name": "Tensorboard", "version": "2.16"},
             {"name": "Boto3", "version": "1.34"},
             {"name": "Kafka-Python", "version": "2.0"},
-            {"name": "Kfp", "version": "2.8"},
+            {"name": "Kfp", "version": "2.11"},
             {"name": "Matplotlib", "version": "3.8"},
             {"name": "Numpy", "version": "1.26"},
             {"name": "Pandas", "version": "2.2"},
diff --git a/manifests/base/jupyter-trustyai-notebook-imagestream.yaml b/manifests/base/jupyter-trustyai-notebook-imagestream.yaml
@@ -69,7 +69,7 @@ spec:
             {"name": "TrustyAI", "version": "0.6"},
             {"name": "Boto3", "version": "1.34"},
             {"name": "Kafka-Python", "version": "2.0"},
-            {"name": "Kfp", "version": "2.8"},
+            {"name": "Kfp", "version": "2.11"},
             {"name": "Matplotlib", "version": "3.6"},
             {"name": "Numpy", "version": "1.24"},
             {"name": "Pandas", "version": "1.5"},
diff --git a/manifests/base/rstudio-gpu-notebook-imagestream.yaml b/manifests/base/rstudio-gpu-notebook-imagestream.yaml
@@ -20,14 +20,14 @@ spec:
         # language=json
         opendatahub.io/notebook-software: |
           [
-            {"name": "CUDA", "version": "12.4"},
+            {"name": "CUDA", "version": "12.1"},
             {"name": "R", "version": "v4.4"},
             {"name": "Python", "version": "v3.11"}
           ]
         # language=json
         opendatahub.io/notebook-python-dependencies: |
           [
-            {"name": "rstudio-server", "version": "4.4"}
+            {"name": "rstudio-server", "version": "2024.04"}
           ]
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
@@ -38,19 +38,19 @@ spec:
       name: "2024.2"
       referencePolicy:
         type: Source
-    # N Version of the image
+    # N-1 Version of the image
     - annotations:
         # language=json
         opendatahub.io/notebook-software: |
           [
             {"name": "CUDA", "version": "12.1"},
-            {"name": "R", "version": "v4.3"},
+            {"name": "R", "version": "v4.4"},
             {"name": "Python", "version": "v3.9"}
           ]
         # language=json
         opendatahub.io/notebook-python-dependencies: |
           [
-            {"name": "rstudio-server", "version": "4.3"}
+            {"name": "rstudio-server", "version": "2023.12"}
           ]
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'false'
diff --git a/manifests/base/rstudio-notebook-imagestream.yaml b/manifests/base/rstudio-notebook-imagestream.yaml
@@ -25,7 +25,7 @@ spec:
         # language=json
         opendatahub.io/notebook-python-dependencies: |
           [
-            {"name": "rstudio-server", "version": "4.4"}
+            {"name": "rstudio-server", "version": "2024.04"}
           ]
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
@@ -36,18 +36,18 @@ spec:
       name: "2024.2"
       referencePolicy:
         type: Source
-    # N - 1 Version of the image
+    # N-1 Version of the image
     - annotations:
         # language=json
         opendatahub.io/notebook-software: |
           [
-            {"name": "R", "version": "v4.3"},
+            {"name": "R", "version": "v4.4"},
             {"name": "Python", "version": "v3.9"}
           ]
         # language=json
         opendatahub.io/notebook-python-dependencies: |
           [
-            {"name": "rstudio-server", "version": "4.3"}
+            {"name": "rstudio-server", "version": "2023.12"}
           ]
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'false'

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ spec:`
`63`	`63`	`[`
`64`	`64`	`{"name": "Boto3", "version": "1.34"},`
`65`	`65`	`{"name": "Kafka-Python", "version": "2.0"},`
`66`		`- {"name": "Kfp", "version": "2.8"},`
	`66`	`+ {"name": "Kfp", "version": "2.11"},`
`67`	`67`	`{"name": "Matplotlib", "version": "3.8"},`
`68`	`68`	`{"name": "Numpy", "version": "1.26"},`
`69`	`69`	`{"name": "Pandas", "version": "2.2"},`
Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,14 @@ spec:`
`20`	`20`	`# language=json`
`21`	`21`	`opendatahub.io/notebook-software: \|`
`22`	`22`	`[`
`23`		`- {"name": "CUDA", "version": "12.4"},`
	`23`	`+ {"name": "CUDA", "version": "12.1"},`
`24`	`24`	`{"name": "R", "version": "v4.4"},`
`25`	`25`	`{"name": "Python", "version": "v3.11"}`
`26`	`26`	`]`
`27`	`27`	`# language=json`
`28`	`28`	`opendatahub.io/notebook-python-dependencies: \|`
`29`	`29`	`[`
`30`		`- {"name": "rstudio-server", "version": "4.4"}`
	`30`	`+ {"name": "rstudio-server", "version": "2024.04"}`
`31`	`31`	`]`
`32`	`32`	`openshift.io/imported-from: quay.io/opendatahub/workbench-images`
`33`	`33`	`opendatahub.io/workbench-image-recommended: 'true'`
`@@ -38,19 +38,19 @@ spec:`
`38`	`38`	`name: "2024.2"`
`39`	`39`	`referencePolicy:`
`40`	`40`	`type: Source`
`41`		`- # N Version of the image`
	`41`	`+ # N-1 Version of the image`
`42`	`42`	`- annotations:`
`43`	`43`	`# language=json`
`44`	`44`	`opendatahub.io/notebook-software: \|`
`45`	`45`	`[`
`46`	`46`	`{"name": "CUDA", "version": "12.1"},`
`47`		`- {"name": "R", "version": "v4.3"},`
	`47`	`+ {"name": "R", "version": "v4.4"},`
`48`	`48`	`{"name": "Python", "version": "v3.9"}`
`49`	`49`	`]`
`50`	`50`	`# language=json`
`51`	`51`	`opendatahub.io/notebook-python-dependencies: \|`
`52`	`52`	`[`
`53`		`- {"name": "rstudio-server", "version": "4.3"}`
	`53`	`+ {"name": "rstudio-server", "version": "2023.12"}`
`54`	`54`	`]`
`55`	`55`	`openshift.io/imported-from: quay.io/opendatahub/workbench-images`
`56`	`56`	`opendatahub.io/workbench-image-recommended: 'false'`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ spec:`
`25`	`25`	`# language=json`
`26`	`26`	`opendatahub.io/notebook-python-dependencies: \|`
`27`	`27`	`[`
`28`		`- {"name": "rstudio-server", "version": "4.4"}`
	`28`	`+ {"name": "rstudio-server", "version": "2024.04"}`
`29`	`29`	`]`
`30`	`30`	`openshift.io/imported-from: quay.io/opendatahub/workbench-images`
`31`	`31`	`opendatahub.io/workbench-image-recommended: 'true'`
`@@ -36,18 +36,18 @@ spec:`
`36`	`36`	`name: "2024.2"`
`37`	`37`	`referencePolicy:`
`38`	`38`	`type: Source`
`39`		`- # N - 1 Version of the image`
	`39`	`+ # N-1 Version of the image`
`40`	`40`	`- annotations:`
`41`	`41`	`# language=json`
`42`	`42`	`opendatahub.io/notebook-software: \|`
`43`	`43`	`[`
`44`		`- {"name": "R", "version": "v4.3"},`
	`44`	`+ {"name": "R", "version": "v4.4"},`
`45`	`45`	`{"name": "Python", "version": "v3.9"}`
`46`	`46`	`]`
`47`	`47`	`# language=json`
`48`	`48`	`opendatahub.io/notebook-python-dependencies: \|`
`49`	`49`	`[`
`50`		`- {"name": "rstudio-server", "version": "4.3"}`
	`50`	`+ {"name": "rstudio-server", "version": "2023.12"}`
`51`	`51`	`]`
`52`	`52`	`openshift.io/imported-from: quay.io/opendatahub/workbench-images`
`53`	`53`	`opendatahub.io/workbench-image-recommended: 'false'`