Skip to content

Commit 7db73c2

Browse files
committed
RHAIENG-389: Remove RStudio buildconfig, then add new imagestreams to kustomization
1 parent 5cdd104 commit 7db73c2

File tree

5 files changed

+130
-157
lines changed

5 files changed

+130
-157
lines changed

manifests/base/cuda-rstudio-buildconfig.yaml

Lines changed: 0 additions & 79 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
apiVersion: image.openshift.io/v1
3+
kind: ImageStream
4+
metadata:
5+
labels:
6+
opendatahub.io/notebook-image: "true"
7+
annotations:
8+
opendatahub.io/notebook-image-creator: RHOAI
9+
opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/rstudio"
10+
opendatahub.io/notebook-image-name: "RStudio | Minimal | CUDA | R 4.5"
11+
opendatahub.io/notebook-image-desc: "RStudio Server Workbench image with an integrated development environment for R, a programming language designed for statistical computing and graphics."
12+
opendatahub.io/notebook-image-order: "22"
13+
opendatahub.io/recommended-accelerators: '["nvidia.com/gpu"]'
14+
name: cuda-rstudio-rhel9
15+
spec:
16+
lookupPolicy:
17+
local: true
18+
tags:
19+
# N Version of the image
20+
- annotations:
21+
# language=json
22+
opendatahub.io/notebook-software: |
23+
[
24+
{"name":"CUDA","version":"12.8"},
25+
{"name":"R","version":"v4.5"},
26+
{"name":"Python","version":"v3.12"}
27+
]
28+
# language=json
29+
opendatahub.io/notebook-python-dependencies: |
30+
[
31+
{"name":"rstudio-server","version":"2025.09"}
32+
]
33+
openshift.io/imported-from: quay.io/modh/cuda-rstudio
34+
from:
35+
kind: DockerImage
36+
name: odh-workbench-rstudio-cuda-r45-py312-ubi9-n_PLACEHOLDER
37+
name: "2025.2"
38+
referencePolicy:
39+
type: Source

manifests/base/kustomization.yaml

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ resources:
99
- jupyter-tensorflow-notebook-imagestream.yaml
1010
- jupyter-trustyai-notebook-imagestream.yaml
1111
- code-server-notebook-imagestream.yaml
12-
- rstudio-buildconfig.yaml
13-
- cuda-rstudio-buildconfig.yaml
12+
- rstudio-imagestream.yaml
13+
- cuda-rstudio-imagestream.yaml
1414
- jupyter-rocm-minimal-notebook-imagestream.yaml
1515
- jupyter-rocm-pytorch-notebook-imagestream.yaml
1616
- jupyter-rocm-tensorflow-notebook-imagestream.yaml
@@ -639,6 +639,32 @@ replacements:
639639
kind: ImageStream
640640
name: code-server-notebook
641641
version: v1
642+
- source:
643+
fieldPath: data.odh-workbench-rstudio-cpu-r45-py312-ubi9-n
644+
kind: ConfigMap
645+
name: notebook-image-params
646+
version: v1
647+
targets:
648+
- fieldPaths:
649+
- spec.tags.0.from.name
650+
select:
651+
group: image.openshift.io
652+
kind: ImageStream
653+
name: rstudio-rhel9
654+
version: v1
655+
- source:
656+
fieldPath: data.odh-workbench-rstudio-cuda-r45-py312-ubi9-n
657+
kind: ConfigMap
658+
name: notebook-image-params
659+
version: v1
660+
targets:
661+
- fieldPaths:
662+
- spec.tags.0.from.name
663+
select:
664+
group: image.openshift.io
665+
kind: ImageStream
666+
name: cuda-rstudio-rhel9
667+
version: v1
642668
- source:
643669
fieldPath: data.odh-workbench-jupyter-minimal-rocm-py312-ubi9-n
644670
kind: ConfigMap
@@ -1367,6 +1393,32 @@ replacements:
13671393
kind: ImageStream
13681394
name: code-server-notebook
13691395
version: v1
1396+
- source:
1397+
fieldPath: data.odh-workbench-rstudio-cpu-r45-py312-ubi9-commit-n
1398+
kind: ConfigMap
1399+
name: notebook-image-commithash
1400+
version: v1
1401+
targets:
1402+
- fieldPaths:
1403+
- spec.tags.0.annotations.[opendatahub.io/notebook-build-commit]
1404+
select:
1405+
group: image.openshift.io
1406+
kind: ImageStream
1407+
name: rstudio-rhel9
1408+
version: v1
1409+
- source:
1410+
fieldPath: data.odh-workbench-rstudio-cuda-r45-py312-ubi9-commit-n
1411+
kind: ConfigMap
1412+
name: notebook-image-commithash
1413+
version: v1
1414+
targets:
1415+
- fieldPaths:
1416+
- spec.tags.0.annotations.[opendatahub.io/notebook-build-commit]
1417+
select:
1418+
group: image.openshift.io
1419+
kind: ImageStream
1420+
name: cuda-rstudio-rhel9
1421+
version: v1
13701422
- source:
13711423
fieldPath: data.odh-workbench-jupyter-minimal-rocm-py312-ubi9-commit-n
13721424
kind: ConfigMap

manifests/base/rstudio-buildconfig.yaml

Lines changed: 0 additions & 76 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
apiVersion: image.openshift.io/v1
3+
kind: ImageStream
4+
metadata:
5+
labels:
6+
opendatahub.io/notebook-image: "true"
7+
annotations:
8+
opendatahub.io/notebook-image-creator: RHOAI
9+
opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/rstudio"
10+
opendatahub.io/notebook-image-name: "RStudio | Minimal | CPU | R 4.5"
11+
opendatahub.io/notebook-image-order: "22"
12+
opendatahub.io/notebook-image-desc: "RStudio Server Workbench image with an integrated development environment for R, a programming language designed for statistical computing and graphics."
13+
name: rstudio-rhel9
14+
spec:
15+
lookupPolicy:
16+
local: true
17+
tags:
18+
# N Version of the image
19+
- annotations:
20+
# language=json
21+
opendatahub.io/notebook-software: |
22+
[
23+
{"name":"R","version":"v4.5"},
24+
{"name":"Python","version":"v3.12"}
25+
]
26+
# language=json
27+
opendatahub.io/notebook-python-dependencies: |
28+
[
29+
{"name":"rstudio-server","version":"2025.09"}
30+
]
31+
openshift.io/imported-from: quay.io/modh/rstudio
32+
from:
33+
kind: DockerImage
34+
name: odh-workbench-rstudio-cpu-r45-py312-ubi9-n_PLACEHOLDER
35+
name: "2025.2"
36+
referencePolicy:
37+
type: Source

0 commit comments

Comments
 (0)