Skip to content

Commit 9737fab

Browse files
openshift-ci[bot]openshift-ci[bot]
authored
Merge pull request #300 from atheo89/tracker-283
Move vscode and r-studio to the base layer
2 parents a1d9142 + 0a251c9 commit 9737fab

File tree

8 files changed

+83
-13
lines changed

8 files changed

+83
-13
lines changed

‎manifests/overlays/additional/code-server-notebook-imagestream.yaml renamed to ‎manifests/base/code-server-notebook-imagestream.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
opendatahub.io/workbench-image-recommended: 'true'
2323
from:
2424
kind: DockerImage
25-
name: quay.io/opendatahub/workbench-images@sha256:1c5bcbfc222dfb59849fee67e050719c688c93d3608f7b46edbe5666263641f3
25+
name: $(odh-codeserver-notebook-n)
2626
name: "2023.2"
2727
referencePolicy:
2828
type: Source
@@ -33,7 +33,7 @@ spec:
3333
openshift.io/imported-from: quay.io/opendatahub/workbench-images
3434
from:
3535
kind: DockerImage
36-
name: quay.io/opendatahub/workbench-images@sha256:fd5b9f65c0f46d4c093e2f58fce305eeb125bf19ee1d88f67b9fafe56142e92d
36+
name: $(odh-codeserver-notebook-n-1)
3737
name: "2023.1"
3838
referencePolicy:
3939
type: Source

‎manifests/base/kustomization.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ resources:
99
- jupyter-tensorflow-notebook-imagestream.yaml
1010
- jupyter-trustyai-notebook-imagestream.yaml
1111
- jupyter-habana-notebook-imagestream.yaml
12+
- code-server-notebook-imagestream.yaml
13+
- rstudio-gpu-notebook-imagestream.yaml
14+
- rstudio-notebook-imagestream.yaml
1215

1316
commonLabels:
1417
opendatahub.io/component: "true"
@@ -146,5 +149,47 @@ vars:
146149
apiVersion: v1
147150
fieldref:
148151
fieldpath: data.odh-habana-notebook-image-n
152+
- name: odh-codeserver-notebook-n
153+
objref:
154+
kind: ConfigMap
155+
name: notebooks-parameters
156+
apiVersion: v1
157+
fieldref:
158+
fieldpath: data.odh-codeserver-notebook-n
159+
- name: odh-codeserver-notebook-n-1
160+
objref:
161+
kind: ConfigMap
162+
name: notebooks-parameters
163+
apiVersion: v1
164+
fieldref:
165+
fieldpath: data.odh-codeserver-notebook-n-1
166+
- name: odh-rstudio-notebook-n
167+
objref:
168+
kind: ConfigMap
169+
name: notebooks-parameters
170+
apiVersion: v1
171+
fieldref:
172+
fieldpath: data.odh-rstudio-notebook-n
173+
- name: odh-rstudio-notebook-n-1
174+
objref:
175+
kind: ConfigMap
176+
name: notebooks-parameters
177+
apiVersion: v1
178+
fieldref:
179+
fieldpath: data.odh-rstudio-notebook-n-1
180+
- name: odh-rstudio-gpu-notebook-n
181+
objref:
182+
kind: ConfigMap
183+
name: notebooks-parameters
184+
apiVersion: v1
185+
fieldref:
186+
fieldpath: data.odh-rstudio-gpu-notebook-n
187+
- name: odh-rstudio-gpu-notebook-n-1
188+
objref:
189+
kind: ConfigMap
190+
name: notebooks-parameters
191+
apiVersion: v1
192+
fieldref:
193+
fieldpath: data.odh-rstudio-gpu-notebook-n-1
149194
configurations:
150195
- params.yaml

‎manifests/base/params.env

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,9 @@ odh-tensorflow-gpu-notebook-image-n-2=quay.io/opendatahub/notebooks@sha256:fc52e
1616
odh-trustyai-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:636fdf26877be4013bc516c5ef4a818b5f7f29119ec3f601005fefc6d49433f0
1717
odh-trustyai-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:9c7dfc1c58bcbafbb4ffae58641e1bc4c3b5850886960bf27c652b7d0635d779
1818
odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:b0821ae2abe45387a371108ac08e7474b64255e5c4519de5da594b4617fd79fe
19+
odh-codeserver-notebook-n=quay.io/opendatahub/workbench-images@sha256:1c5bcbfc222dfb59849fee67e050719c688c93d3608f7b46edbe5666263641f3
20+
odh-codeserver-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:fd5b9f65c0f46d4c093e2f58fce305eeb125bf19ee1d88f67b9fafe56142e92d
21+
odh-rstudio-notebook-n=quay.io/opendatahub/workbench-images@sha256:8e99e4e3800db121d02b50adec5eba27746bf89d32dba3e2b17e8d750ac53608
22+
odh-rstudio-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:75d6764e1155c1d18dc4472ff319f9291d0d9703b19ee1374e902b6ab7f55cfb
23+
odh-rstudio-gpu-notebook-n=quay.io/opendatahub/workbench-images@sha256:3ad0bb5f3b8c2ca1d29a423913b6d8f32353d9787c5f38e4b56a9a922f6e3cdd
24+
odh-rstudio-gpu-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:aef5fd12264651abf286e9a4efbe25ca002cc257fbc6f1a5daf39fd55c7d6206

‎manifests/base/params.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,27 @@ varReference:
7272
kind: ImageStream
7373
apiGroup: image.openshift.io/v1
7474
name: odh-habana-notebook-image-n
75+
- path: spec/tags[]/from/name
76+
kind: ImageStream
77+
apiGroup: image.openshift.io/v1
78+
name: odh-codeserver-notebook-n
79+
- path: spec/tags[]/from/name
80+
kind: ImageStream
81+
apiGroup: image.openshift.io/v1
82+
name: odh-codeserver-notebook-n-1
83+
- path: spec/tags[]/from/name
84+
kind: ImageStream
85+
apiGroup: image.openshift.io/v1
86+
name: odh-rstudio-notebook-n
87+
- path: spec/tags[]/from/name
88+
kind: ImageStream
89+
apiGroup: image.openshift.io/v1
90+
name: odh-rstudio-notebook-n-1
91+
- path: spec/tags[]/from/name
92+
kind: ImageStream
93+
apiGroup: image.openshift.io/v1
94+
name: odh-rstudio-gpu-notebook-n
95+
- path: spec/tags[]/from/name
96+
kind: ImageStream
97+
apiGroup: image.openshift.io/v1
98+
name: odh-rstudio-gpu-notebook-n-1

‎manifests/overlays/additional/rstudio-gpu-notebook-imagestream.yaml renamed to ‎manifests/base/rstudio-gpu-notebook-imagestream.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
opendatahub.io/workbench-image-recommended: 'true'
2424
from:
2525
kind: DockerImage
26-
name: quay.io/opendatahub/workbench-images@sha256:3ad0bb5f3b8c2ca1d29a423913b6d8f32353d9787c5f38e4b56a9a922f6e3cdd
26+
name: $(odh-rstudio-gpu-notebook-n)
2727
name: "2023.2"
2828
referencePolicy:
2929
type: Source
@@ -34,7 +34,7 @@ spec:
3434
openshift.io/imported-from: quay.io/opendatahub/workbench-images
3535
from:
3636
kind: DockerImage
37-
name: quay.io/opendatahub/workbench-images@sha256:aef5fd12264651abf286e9a4efbe25ca002cc257fbc6f1a5daf39fd55c7d6206
37+
name: $(odh-rstudio-gpu-notebook-n-1)
3838
name: "2023.1"
3939
referencePolicy:
4040
type: Source

‎manifests/overlays/additional/rstudio-notebook-imagestream.yaml renamed to ‎manifests/base/rstudio-notebook-imagestream.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
opendatahub.io/workbench-image-recommended: 'true'
2323
from:
2424
kind: DockerImage
25-
name: quay.io/opendatahub/workbench-images@sha256:8e99e4e3800db121d02b50adec5eba27746bf89d32dba3e2b17e8d750ac53608
25+
name: $(odh-rstudio-notebook-n)
2626
name: "2023.2"
2727
referencePolicy:
2828
type: Source
@@ -33,7 +33,7 @@ spec:
3333
openshift.io/imported-from: quay.io/opendatahub/workbench-images
3434
from:
3535
kind: DockerImage
36-
name: quay.io/opendatahub/workbench-images@sha256:75d6764e1155c1d18dc4472ff319f9291d0d9703b19ee1374e902b6ab7f55cfb
36+
name: $(odh-rstudio-notebook-n-1)
3737
name: "2023.1"
3838
referencePolicy:
3939
type: Source

‎manifests/overlays/additional/README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
Open Data Hub Tier 1 Notebooks
22
===
33

4-
All of the notebooks in this repo are supported by the ODH Community as a Tier 1 component but not part of the ODH Core deployment.
4+
All of the notebooks in this layer are supported by the ODH Community as a Tier 1 component but not part of the ODH Core deployment.
55
The source build files for any notebook in this repo must exist under the [opendatahub-io](https://github.com/opendatahub-io) organization
66

77
Notebooks:
88
===
9-
* [Code Server Notebook ](https://github.com/opendatahub-io/notebooks/tree/main/codeserver) - Notebook image, allows to run Visual Studio Code (VSCode)
10-
* [R Studio Notebook](https://github.com/opendatahub-io/notebooks/tree/main/rstudio) - Notebook image, integrated development environment (IDE) for R
11-
* [CUDA R Studio Notebook](https://github.com/opendatahub-io/notebooks/tree/main/rstudio) - Notebook image, integrated development environment (IDE) for R with embedded CUDA capabilities
9+
- None

‎manifests/overlays/additional/kustomization.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ kind: Kustomization
44

55
resources:
66
- ../../base
7-
- code-server-notebook-imagestream.yaml
8-
- rstudio-notebook-imagestream.yaml
9-
- rstudio-gpu-notebook-imagestream.yaml
107

118
commonLabels:
129
opendatahub.io/component: "true"

0 commit comments

Comments
 (0)