Skip to content

Commit f517925

Browse files
harshad16harshad16
authored
Merge pull request #481 from atheo89/RHOAIENG-4343-imagestreams-upstream
Update Habana ImageStream with the 1.13 version and adding several documentation fixes
2 parents 1efd888 + 6aad7e2 commit f517925

File tree

10 files changed

+56
-10
lines changed

10 files changed

+56
-10
lines changed

‎ci/check-params-env.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ PARAMS_ENV_PATH="manifests/base/params.env"
2424

2525
# This value needs to be updated everytime we deliberately change number of the
2626
# images we want to have in the `params.env` file.
27-
EXPECTED_NUM_RECORDS=19
27+
EXPECTED_NUM_RECORDS=20
2828

2929
# ---------------------------- DEFINED FUNCTIONS ----------------------------- #
3030

@@ -128,6 +128,12 @@ function check_image_variable_matches_name_and_commitref() {
128128
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
129129
;;
130130
odh-habana-notebook-image-n)
131+
expected_name="odh-notebook-habana-jupyter-1.13.0-ubi8-python-3.8"
132+
# expected_commitref="2024a"
133+
expected_commitref="main"
134+
expected_build_name="habana-jupyter-1.13.0-ubi8-python-3.8"
135+
;;
136+
odh-habana-notebook-image-n-1)
131137
expected_name="odh-notebook-habana-jupyter-1.10.0-ubi8-python-3.8"
132138
# expected_commitref="2024a"
133139
expected_commitref="main"

‎habana/1.13.0/ubi8-python-3.8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ ENV TCMALLOC_LARGE_ALLOC_REPORT_THRESHOLD=7516192768
146146
RUN dnf clean all && rm -rf /var/cache/dnf && rm -rf /tmp/*
147147

148148
## Label the image with details required by ODH
149-
LABEL name="odh-notebook-habana-jupyter-1.3.0-ubi8-python-3.8" \
149+
LABEL name="odh-notebook-habana-jupyter-1.13.0-ubi8-python-3.8" \
150150
summary="Jupyter HabanaAI 1.13.0 notebook image for ODH notebooks" \
151151
description="Jupyter HabanaAI 1.13.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
152152
io.k8s.display-name="Jupyter HabanaAI 1.13.0 notebook image for ODH notebooks" \

‎habana/1.13.0/ubi8-python-3.8/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# Habana Notebook Image
2-
This directory contains the Dockerfile to build a Notebook image compatible with 1.11.0 Habana Version.
2+
This directory contains the Dockerfile to build a Notebook image compatible with 1.13.0 Habana Version.
33

44
Currently supporting the support matrix:
55
https://docs.habana.ai/en/latest/Support_Matrix/Support_Matrix.html
66

77
| Firmware | version |
88
| ------------------------ | ---------------- |
99
| First-gen Gaudi Firmware | 1.2.3 |
10-
| Gaudi2 Firmware | 1.13.0-fw-45.1.1 |
10+
| Gaudi2 Firmware | 1.14.0-fw-48.0.1 |
1111

1212

1313
| Python-package | version |
1414
| -------------- | ------- |
1515
| torch | 2.1.0 |
16-
| tensorflow | 2.12.1 |
16+
| tensorflow | 2.13.1 |
1717
| pandas | 1.5.3 |
1818
| numpy | 1.23.5 |
1919
| scipy | 1.10.1 |

‎habana/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ This directory contains the Dockerfiles to build Notebook images compatible with
44
Currently supporting the support matrix:
55
https://docs.habana.ai/en/latest/Support_Matrix/Support_Matrix_v1.9.0.html
66
https://docs.habana.ai/en/latest/Support_Matrix/Support_Matrix_v1.10.0.html
7+
https://docs.habana.ai/en/latest/Support_Matrix/Support_Matrix_v1.13.0.html
78
https://docs.habana.ai/en/latest/Support_Matrix/Support_Matrix.html
89

910

@@ -24,9 +25,11 @@ user can include the habanaAI compatible image directly to Opendatahub.
2425
https://github.com/HabanaAI/Setup_and_Install/tree/1.9.0
2526
https://github.com/HabanaAI/Setup_and_Install/tree/1.10.0
2627
https://github.com/HabanaAI/Setup_and_Install/tree/1.11.0
28+
https://github.com/HabanaAI/Setup_and_Install/tree/1.13.0
2729

2830

2931
For further documentation related to HabanaAI, please refer:
3032
https://docs.habana.ai/en/v1.9.0/Gaudi_Overview/index.html
3133
https://docs.habana.ai/en/v1.10.0/Gaudi_Overview/index.html
3234
https://docs.habana.ai/en/v1.11.0/Gaudi_Overview/index.html
35+
https://docs.habana.ai/en/v1.13.0/Gaudi_Overview/index.html

‎manifests/base/commit.env

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ odh-tensorflow-gpu-notebook-image-commit-n=6f4c36b
1010
odh-tensorflow-gpu-notebook-image-commit-n-1=ae2f0fc
1111
odh-trustyai-notebook-image-commit-n=6f4c36b
1212
odh-trustyai-notebook-image-commit-n-1=ae2f0fc
13-
odh-habana-notebook-image-commit-n=e5b5f1f
13+
odh-habana-notebook-image-commit-n=e66dc95
14+
odh-habana-notebook-image-commit-n-1=e5b5f1f
1415
odh-codeserver-notebook-image-commit-n=6f4c36b
1516
odh-codeserver-notebook-image-commit-n-1=ae2f0fc
1617
odh-rstudio-notebook-image-commit-n=6f4c36b

‎manifests/base/commit.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ varReference:
5252
kind: ImageStream
5353
apiGroup: image.openshift.io/v1
5454
name: odh-habana-notebook-image-commit-n
55+
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
56+
kind: ImageStream
57+
apiGroup: image.openshift.io/v1
58+
name: odh-habana-notebook-image-commit-n-1
5559
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
5660
kind: ImageStream
5761
apiGroup: image.openshift.io/v1

‎manifests/base/jupyter-habana-notebook-imagestream.yaml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,29 @@ spec:
1515
lookupPolicy:
1616
local: true
1717
tags:
18-
# 1.10.0 Version of the image n-1
18+
# 1.13.0 Version of the image n
1919
- annotations:
20-
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.10"}]'
21-
opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"TensorFlow","version":"2.12.0"},{"name":"PyTorch","version":"2.0.1"},{"name":"Elyra","version":"3.15"}]'
20+
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.13"}]'
21+
opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.34"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.7"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"2.0"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.10"},{"name":"TensorFlow","version":"2.13"},{"name":"PyTorch","version":"2.1"},{"name":"ODH-Elyra","version":"3.16"}]'
2222
openshift.io/imported-from: quay.io/opendatahub/workbench-images
2323
opendatahub.io/workbench-image-recommended: 'true'
2424
opendatahub.io/notebook-build-commit: $(odh-habana-notebook-image-commit-n)
2525
from:
2626
kind: DockerImage
2727
name: $(odh-habana-notebook-image-n)
28+
name: "2024.1"
29+
referencePolicy:
30+
type: Source
31+
# 1.10.0 Version of the image n-1
32+
- annotations:
33+
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.10"}]'
34+
opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"TensorFlow","version":"2.12"},{"name":"PyTorch","version":"2.0"},{"name":"Elyra","version":"3.15"}]'
35+
openshift.io/imported-from: quay.io/opendatahub/workbench-images
36+
opendatahub.io/workbench-image-recommended: "false"
37+
opendatahub.io/notebook-build-commit: $(odh-habana-notebook-image-commit-n-1)
38+
from:
39+
kind: DockerImage
40+
name: $(odh-habana-notebook-image-n-1)
2841
name: "2023.2"
2942
referencePolicy:
3043
type: Source

‎manifests/base/kustomization.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,13 @@ vars:
116116
apiVersion: v1
117117
fieldref:
118118
fieldpath: data.odh-habana-notebook-image-n
119+
- name: odh-habana-notebook-image-n-1
120+
objref:
121+
kind: ConfigMap
122+
name: notebooks-parameters
123+
apiVersion: v1
124+
fieldref:
125+
fieldpath: data.odh-habana-notebook-image-n-1
119126
- name: odh-codeserver-notebook-n
120127
objref:
121128
kind: ConfigMap
@@ -249,6 +256,13 @@ vars:
249256
apiVersion: v1
250257
fieldref:
251258
fieldpath: data.odh-habana-notebook-image-commit-n
259+
- name: odh-habana-notebook-image-commit-n-1
260+
objref:
261+
kind: ConfigMap
262+
name: notebook
263+
apiVersion: v1
264+
fieldref:
265+
fieldpath: data.odh-habana-notebook-image-commit-n-1
252266
- name: odh-codeserver-notebook-image-commit-n
253267
objref:
254268
kind: ConfigMap

‎manifests/base/params.env

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ odh-tensorflow-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:
1010
odh-tensorflow-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:b1b5395c6d41cbd5e7b13841a43430a41ad411feac712f2fb40df335c935e1f1
1111
odh-trustyai-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:3e836a3b43b4397f79b794e9e4a43e90e48f1eaf46c7796672f10b66b3728bb9
1212
odh-trustyai-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:f9cc94e6b2e5ab7798963a9394a582f95919e199e557dcc4b296c8ac285fdc74
13-
odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:b0821ae2abe45387a371108ac08e7474b64255e5c4519de5da594b4617fd79fe
13+
odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:a88431ba1556abde63016e054c3ff84699a36d6f666157dd3ac6ad7a0d8d5584
14+
odh-habana-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:b0821ae2abe45387a371108ac08e7474b64255e5c4519de5da594b4617fd79fe
1415
odh-codeserver-notebook-n=quay.io/opendatahub/workbench-images@sha256:276b1e209ccf85b7a94f679ebd938496113d4d8d293151ff24c754d141b73966
1516
odh-codeserver-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:79ba73f39ad44186403199eb802980308f5145549d856ba20209f4ba2a8da978
1617
odh-rstudio-notebook-n=quay.io/opendatahub/workbench-images@sha256:d1df688ec039ff8aa57f070d10254057daaa1573b1467d0001c12297aa0141ff

‎manifests/base/params.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ varReference:
5252
kind: ImageStream
5353
apiGroup: image.openshift.io/v1
5454
name: odh-habana-notebook-image-n
55+
- path: spec/tags[]/from/name
56+
kind: ImageStream
57+
apiGroup: image.openshift.io/v1
58+
name: odh-habana-notebook-image-n-1
5559
- path: spec/tags[]/from/name
5660
kind: ImageStream
5761
apiGroup: image.openshift.io/v1

0 commit comments

Comments
 (0)