Merge pull request #375 from dibryant/digest_updater

automation of the hash update on the annotation with digest updater
opendatahub-io · Dec 8, 2023 · cadbe9e · cadbe9e
2 parents 9e1ed7a + 58a9509
commit cadbe9e
Show file tree

Hide file tree

Showing 14 changed files with 335 additions and 25 deletions.
diff --git a/.github/workflows/notebooks-digest-updater-upstream.yaml b/.github/workflows/notebooks-digest-updater-upstream.yaml
@@ -89,6 +89,15 @@ jobs:
               done
               git fetch origin  ${{ env.DIGEST_UPDATER_BRANCH }} && git pull origin  ${{ env.DIGEST_UPDATER_BRANCH }} && git add manifests/base/params.env && git commit -m "Update images for release N via ${{ env.DIGEST_UPDATER_BRANCH }} GitHub action" && git push origin  ${{ env.DIGEST_UPDATER_BRANCH }}
 
+      - name: Fetch digest, and update the commit.env file
+        run: |
+            echo Latest commit is: ${{ steps.hash-n.outputs.HASH_N }} on ${{ env.RELEASE_VERSION_N}}
+            COMMIT=("odh-minimal-notebook-image-commit-n" "odh-minimal-gpu-notebook-image-commit-n" "odh-pytorch-gpu-notebook-image-commit-n" "odh-generic-data-science-notebook-image-commit-n" "odh-tensorflow-gpu-notebook-image-commit-n" "odh-trustyai-notebook-image-commit-n")
+            for val in "${COMMIT[@]}"; do
+              echo $val
+              sed -i "s|${val}=.*|${val}=${{ steps.hash-n.outputs.HASH_N }}|" manifests/base/commit.env
+            done
+            git fetch origin  ${{ env.DIGEST_UPDATER_BRANCH }} && git pull origin  ${{ env.DIGEST_UPDATER_BRANCH }} && git add manifests/base/commit.env && git commit -m "Update image commits for release N via ${{ env.DIGEST_UPDATER_BRANCH }} GitHub action" && git push origin  ${{ env.DIGEST_UPDATER_BRANCH }}      
   update-n-1-version:
     needs: [initialize, update-n-version]
     runs-on: ubuntu-latest
@@ -137,7 +146,15 @@ jobs:
                 sed -i "s|${image}=.*|${image}=$output|" manifests/base/params.env
               done
               git fetch origin  ${{ env.DIGEST_UPDATER_BRANCH }} && git pull origin  ${{ env.DIGEST_UPDATER_BRANCH }} && git add manifests/base/params.env && git commit -m "Update images for release N-1 via ${{ env.DIGEST_UPDATER_BRANCH }} GitHub action" && git push origin  ${{ env.DIGEST_UPDATER_BRANCH }}
-
+      - name: Fetch digest, and update the commit.env file
+        run: |
+              echo Latest commit is: ${{ steps.hash-n.outputs.HASH_N }} on ${{ env.RELEASE_VERSION_N}}
+              COMMIT=("odh-minimal-notebook-image-commit-n" "odh-minimal-gpu-notebook-image-commit-n" "odh-pytorch-gpu-notebook-image-commit-n" "odh-generic-data-science-notebook-image-commit-n" "odh-tensorflow-gpu-notebook-image-commit-n" "odh-trustyai-notebook-image-commit-n")
+              for val in "${COMMIT[@]}"; do
+                echo $val
+                sed -i "s|${val}=.*|${val}=${{ steps.hash-n.outputs.HASH_N }}|" manifests/base/commit.env
+              done
+              git fetch origin  ${{ env.DIGEST_UPDATER_BRANCH }} && git pull origin  ${{ env.DIGEST_UPDATER_BRANCH }} && git add manifests/base/commit.env && git commit -m "Update image commits for release N via ${{ env.DIGEST_UPDATER_BRANCH }} GitHub action" && git push origin  ${{ env.DIGEST_UPDATER_BRANCH }}
   # Creates the Pull Request
   open-pull-request:
     needs: [update-n-version, update-n-1-version]

diff --git a/manifests/base/code-server-notebook-imagestream.yaml b/manifests/base/code-server-notebook-imagestream.yaml
@@ -20,7 +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"
+        opendatahub.io/notebook-build-commit: $(odh-codeserver-notebook-image-commit-n)
       from:
         kind: DockerImage
         name: $(odh-codeserver-notebook-n)
@@ -33,7 +33,7 @@ spec:
         opendatahub.io/notebook-python-dependencies: '[{"name":"code-sever","version":"4.11"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'false'
-        opendatahub.io/notebook-build-commit: "6332c3b"
+        opendatahub.io/notebook-build-commit: $(odh-codeserver-notebook-image-commit-n-1)
       from:
         kind: DockerImage
         name: $(odh-codeserver-notebook-n-1)

diff --git a/manifests/base/commit.env b/manifests/base/commit.env
@@ -0,0 +1,24 @@
+odh-minimal-notebook-image-commit-n=cf1b63e
+odh-minimal-notebook-image-commit-n-1=17c2e49
+odh-minimal-notebook-image-commit-n-2=4c8f26e
+odh-minimal-gpu-notebook-image-commit-n=cf1b63e
+odh-minimal-gpu-notebook-image-commit-n-1=17c2e49
+odh-minimal-gpu-notebook-image-commit-n-2=17c2e49
+odh-pytorch-gpu-notebook-image-commit-n=cf1b63e
+odh-pytorch-gpu-notebook-image-commit-n-1=17c2e49
+odh-pytorch-gpu-notebook-image-commit-n-2=4c8f26e
+odh-generic-data-science-notebook-image-commit-n=cf1b63e
+odh-generic-data-science-notebook-image-commit-n-1=17c2e49
+odh-generic-data-science-notebook-image-commit-n-2=4c8f26e
+odh-tensorflow-gpu-notebook-image-commit-n=cf1b63e
+odh-tensorflow-gpu-notebook-image-commit-n-1=17c2e49
+odh-tensorflow-gpu-notebook-image-commit-n-2=4c8f26e
+odh-trustyai-notebook-image-commit-n=cf1b63e
+odh-trustyai-notebook-image-commit-n-1=17c2e49
+odh-habana-notebook-image-commit-n=e5b5f1f
+odh-codeserver-notebook-image-commit-n=c91d58c
+odh-codeserver-notebook-image-commit-n-1=6332c3b
+odh-rstudio-notebook-image-commit-n=c91d58c
+odh-rstudio-notebook-image-commit-n-1=6332c3b
+odh-rstudio-gpu-notebook-image-commit-n=c91d58c
+odh-rstudio-gpu-notebook-image-commit-n-1=6332c3b
diff --git a/manifests/base/commit.yaml b/manifests/base/commit.yaml
@@ -0,0 +1,98 @@
+---
+varReference:
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-minimal-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-minimal-notebook-image-commit-n-1
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-minimal-notebook-image-commit-n-2
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-minimal-gpu-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-minimal-gpu-notebook-image-commit-n-1
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-minimal-gpu-notebook-image-commit-n-2
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-pytorch-gpu-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-pytorch-gpu-notebook-image-commit-n-1
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-pytorch-gpu-notebook-image-commit-n-2
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-generic-data-science-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-generic-data-science-notebook-image-commit-n-1
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-generic-data-science-notebook-image-commit-n-2
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-tensorflow-gpu-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-tensorflow-gpu-notebook-image-commit-n-1
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-tensorflow-gpu-notebook-image-commit-n-2
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-trustyai-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-trustyai-notebook-image-commit-n-1
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-habana-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-codeserver-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-codeserver-notebook-image-commit-n-1
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rstudio-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rstudio-notebook-image-commit-n-1
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rstudio-gpu-notebook-image-commit-n
+  - path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-rstudio-gpu-notebook-image-commit-n-1
diff --git a/manifests/base/jupyter-datascience-notebook-imagestream.yaml b/manifests/base/jupyter-datascience-notebook-imagestream.yaml
@@ -20,7 +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.12"}, {"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"
+        opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n)
       from:
         kind: DockerImage
         name: $(odh-generic-data-science-notebook-image-n)
@@ -33,7 +33,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.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/workbench-image-recommended: 'false'
-        opendatahub.io/notebook-build-commit: "17c2e49"
+        opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n-1)
       from:
         kind: DockerImage
         name: $(odh-generic-data-science-notebook-image-n-1)
@@ -46,7 +46,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"
+        opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n-2)
       from:
         kind: DockerImage
         name: $(odh-generic-data-science-notebook-image-n-2)

diff --git a/manifests/base/jupyter-habana-notebook-imagestream.yaml b/manifests/base/jupyter-habana-notebook-imagestream.yaml
@@ -21,7 +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"
+        opendatahub.io/notebook-build-commit: $(odh-habana-notebook-image-commit-n)
       from:
         kind: DockerImage
         name: $(odh-habana-notebook-image-n)

diff --git a/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml b/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml
@@ -21,7 +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"
+        opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n)
       from:
         kind: DockerImage
         name: $(odh-minimal-gpu-notebook-image-n)
@@ -34,7 +34,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: 'false'
-        opendatahub.io/notebook-build-commit: "17c2e49"
+        opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n-1)
       from:
         kind: DockerImage
         name: $(odh-minimal-gpu-notebook-image-n-1)
@@ -47,7 +47,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"
+        opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n-2)
       from:
         kind: DockerImage
         name: $(odh-minimal-gpu-notebook-image-n-2)

diff --git a/manifests/base/jupyter-minimal-notebook-imagestream.yaml b/manifests/base/jupyter-minimal-notebook-imagestream.yaml
@@ -21,7 +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"
+        opendatahub.io/notebook-build-commit: $(odh-minimal-notebook-image-commit-n)
       from:
         kind: DockerImage
         name: $(odh-minimal-notebook-image-n)
@@ -34,7 +34,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: 'false'
-        opendatahub.io/notebook-build-commit: "17c2e49"
+        opendatahub.io/notebook-build-commit: $(odh-minimal-notebook-image-commit-n-1)
       from:
         kind: DockerImage
         name: $(odh-minimal-notebook-image-n-1)
@@ -47,7 +47,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"
+        opendatahub.io/notebook-build-commit: $(odh-minimal-notebook-image-commit-n-2)
       from:
         kind: DockerImage
         name: $(odh-minimal-notebook-image-n-2)

diff --git a/manifests/base/jupyter-pytorch-notebook-imagestream.yaml b/manifests/base/jupyter-pytorch-notebook-imagestream.yaml
@@ -21,7 +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.12"}, {"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"
+        opendatahub.io/notebook-build-commit: $(odh-pytorch-gpu-notebook-image-commit-n)
       from:
         kind: DockerImage
         name: $(odh-pytorch-gpu-notebook-image-n)
@@ -34,7 +34,7 @@ spec:
         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/workbench-image-recommended: 'false'
-        opendatahub.io/notebook-build-commit: "17c2e49"
+        opendatahub.io/notebook-build-commit: $(odh-pytorch-gpu-notebook-image-commit-n-1)
       from:
         kind: DockerImage
         name: $(odh-pytorch-gpu-notebook-image-n-1)
@@ -47,7 +47,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"
+        opendatahub.io/notebook-build-commit:  $(odh-pytorch-gpu-notebook-image-commit-n-2)
       from:
         kind: DockerImage
         name: $(odh-pytorch-gpu-notebook-image-n-2)