Skip to content

Commit

Permalink
Merge pull request #307 from dibryant/imagestream
Browse files Browse the repository at this point in the history
adding build commit info annotations in imagestream
  • Loading branch information
openshift-merge-bot[bot] authored Nov 9, 2023
2 parents 3bccf4a + 3600216 commit b42e581
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 0 deletions.
1 change: 1 addition & 0 deletions docs/workbench-imagestreams.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ spec:
- **`openshift.io/imported-from:`** - a reference to the image repository where the workbench image was obtained (e.g. `quay.io/repository/opendatahub/workbench-images`)
- **`opendatahub.io/workbench-image-recommended:`** - a flag that allows the ImageStream tag to be marked as Recommended (used by the UI to distinguish which tags are recommended for use, e.g., when the workbench image offers multiple tags to choose from)
- **`opendatahub.io/image-tag-outdated:`** - a reference to the image version Tags that are outdated and out of regular maintaince cycle. The image tag would be eventually removed.
- **`opendatahub.io/notebook-build-commit:`** - a reference to the build commit with the ID to look at the updated information.

### **ImageStream definitions for the supported out-of-the-box images in ODH**

Expand Down
2 changes: 2 additions & 0 deletions manifests/base/code-server-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"code-sever","version":"4.16"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/notebook-build-commit: "c91d58c"
from:
kind: DockerImage
name: $(odh-codeserver-notebook-n)
Expand All @@ -31,6 +32,7 @@ spec:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"code-sever","version":"4.11"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/notebook-build-commit: "6332c3b"
from:
kind: DockerImage
name: $(odh-codeserver-notebook-n-1)
Expand Down
3 changes: 3 additions & 0 deletions manifests/base/jupyter-datascience-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.28"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.8"}, {"name":"Sklearn-onnx","version":"1.15"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/notebook-build-commit: "cf1b63e"
from:
kind: DockerImage
name: $(odh-generic-data-science-notebook-image-n)
Expand All @@ -31,6 +32,7 @@ spec:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
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.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/notebook-build-commit: "17c2e49"
from:
kind: DockerImage
name: $(odh-generic-data-science-notebook-image-n-1)
Expand All @@ -43,6 +45,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]'
openshift.io/imported-from: quay.io/opendatahub/notebooks
opendatahub.io/image-tag-outdated: 'true'
opendatahub.io/notebook-build-commit: "4c8f26e"
from:
kind: DockerImage
name: $(odh-generic-data-science-notebook-image-n-2)
Expand Down
1 change: 1 addition & 0 deletions manifests/base/jupyter-habana-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ spec:
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"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/notebook-build-commit: "e5b5f1f"
from:
kind: DockerImage
name: $(odh-habana-notebook-image-n)
Expand Down
3 changes: 3 additions & 0 deletions manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.5"},{"name": "Notebook","version": "6.5"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/notebook-build-commit: "cf1b63e"
from:
kind: DockerImage
name: $(odh-minimal-gpu-notebook-image-n)
Expand All @@ -32,6 +33,7 @@ spec:
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.5"},{"name":"Notebook","version":"6.5"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/notebook-build-commit: "17c2e49"
from:
kind: DockerImage
name: $(odh-minimal-gpu-notebook-image-n-1)
Expand All @@ -44,6 +46,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.2"},{"name":"Notebook","version":"6.4"}]'
openshift.io/imported-from: quay.io/opendatahub/notebooks
opendatahub.io/image-tag-outdated: 'true'
opendatahub.io/notebook-build-commit: "4c8f26e"
from:
kind: DockerImage
name: $(odh-minimal-gpu-notebook-image-n-2)
Expand Down
3 changes: 3 additions & 0 deletions manifests/base/jupyter-minimal-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ spec:
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/default-image: "true"
opendatahub.io/notebook-build-commit: "cf1b63e"
from:
kind: DockerImage
name: $(odh-minimal-notebook-image-n)
Expand All @@ -32,6 +33,7 @@ spec:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.5"}, {"name": "Notebook","version": "6.5"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/notebook-build-commit: "17c2e49"
from:
kind: DockerImage
name: $(odh-minimal-notebook-image-n-1)
Expand All @@ -44,6 +46,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.2"}, {"name": "Notebook","version": "6.4"}]'
openshift.io/imported-from: quay.io/opendatahub/notebooks
opendatahub.io/image-tag-outdated: 'true'
opendatahub.io/notebook-build-commit: "4c8f26e"
from:
kind: DockerImage
name: $(odh-minimal-notebook-image-n-2)
Expand Down
3 changes: 3 additions & 0 deletions manifests/base/jupyter-pytorch-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"2.0"},{"name":"Tensorboard","version":"2.13"},{"name":"Boto3","version":"1.28"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.8"}, {"name":"Sklearn-onnx","version":"1.15"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/notebook-build-commit: "cf1b63e"
from:
kind: DockerImage
name: $(odh-pytorch-gpu-notebook-image-n)
Expand All @@ -32,6 +33,7 @@ spec:
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"PyTorch","version":"1.13"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.13"},{"name":"Tensorboard","version":"2.11"},{"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.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/notebook-build-commit: "17c2e49"
from:
kind: DockerImage
name: $(odh-pytorch-gpu-notebook-image-n-1)
Expand All @@ -44,6 +46,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.8"},{"name":"Tensorboard","version":"2.6"},{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]'
openshift.io/imported-from: quay.io/opendatahub/notebooks
opendatahub.io/image-tag-outdated: 'true'
opendatahub.io/notebook-build-commit: "4c8f26e"
from:
kind: DockerImage
name: $(odh-pytorch-gpu-notebook-image-n-2)
Expand Down
3 changes: 3 additions & 0 deletions manifests/base/jupyter-tensorflow-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.13"},{"name":"Tensorboard","version":"2.13"},{"name":"Boto3","version":"1.28"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.8"}, {"name":"sklearn-onnx","version":"1.15"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/notebook-build-commit: "cf1b63e"
from:
kind: DockerImage
name: $(odh-tensorflow-gpu-notebook-image-n)
Expand All @@ -32,6 +33,7 @@ spec:
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"TensorFlow","version":"2.11"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.11"},{"name":"Tensorboard","version":"2.11"},{"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.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/notebook-build-commit: "17c2e49"
from:
kind: DockerImage
name: $(odh-tensorflow-gpu-notebook-image-n-1)
Expand All @@ -44,6 +46,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.7"},{"name":"Tensorboard","version":"2.6"},{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]'
openshift.io/imported-from: quay.io/opendatahub/notebooks
opendatahub.io/image-tag-outdated: 'true'
opendatahub.io/notebook-build-commit: "4c8f26e"
from:
kind: DockerImage
name: $(odh-tensorflow-gpu-notebook-image-n-2)
Expand Down
2 changes: 2 additions & 0 deletions manifests/base/jupyter-trustyai-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.3"},{"name":"Boto3","version":"1.28"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.8"}, {"name":"Sklearn-onnx","version":"1.15"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/notebook-build-commit: "cf1b63e"
from:
kind: DockerImage
name: $(odh-trustyai-notebook-image-n)
Expand All @@ -31,6 +32,7 @@ spec:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.2"}, {"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.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/notebook-build-commit: "17c2e49"
from:
kind: DockerImage
name: $(odh-trustyai-notebook-image-n-1)
Expand Down
2 changes: 2 additions & 0 deletions manifests/base/rstudio-gpu-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"r-studio","version":"4.3"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/notebook-build-commit: "c91d58c"
from:
kind: DockerImage
name: $(odh-rstudio-gpu-notebook-n)
Expand All @@ -32,6 +33,7 @@ spec:
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"r-studio","version":"4.3"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/notebook-build-commit: "6332c3b"
from:
kind: DockerImage
name: $(odh-rstudio-gpu-notebook-n-1)
Expand Down
2 changes: 2 additions & 0 deletions manifests/base/rstudio-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ spec:
opendatahub.io/notebook-python-dependencies: '[{"name":"r-studio","version":"4.3"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/workbench-image-recommended: 'true'
opendatahub.io/notebook-build-commit: "c91d58c"
from:
kind: DockerImage
name: $(odh-rstudio-notebook-n)
Expand All @@ -31,6 +32,7 @@ spec:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"r-studio","version":"4.3"}]'
openshift.io/imported-from: quay.io/opendatahub/workbench-images
opendatahub.io/notebook-build-commit: "6332c3b"
from:
kind: DockerImage
name: $(odh-rstudio-notebook-n-1)
Expand Down

0 comments on commit b42e581

Please sign in to comment.