Sync odh/main into rhds/main

.editorconfig

@@ -10,3 +10,6 @@ trim_trailing_whitespace = true
 
 [Makefile]
 indent_style = tab
+
+[*.py]
+max_line_length = 120

.github/workflows/build-notebooks-TEMPLATE.yaml

@@ -39,8 +39,6 @@ jobs:
       TRIVY_VULNDB: "/home/runner/.local/share/containers/trivy_db"
       # Targets (and their folder) that should be scanned using FS instead of IMAGE scan due to resource constraints
       TRIVY_SCAN_FS_JSON: '{}'
-      # Poetry version for use in running tests
-      POETRY_VERSION: '2.0.0'
 
     steps:
 
@@ -315,33 +313,26 @@ jobs:
 
       # region Pytest image tests
 
-      - name: Install poetry
-        if: steps.cache-poetry-restore.outputs.cache-hit != 'true'
-        run: pipx install poetry==${{ env.POETRY_VERSION }}
-        env:
-          PIPX_HOME: /home/runner/.local/pipx
-          PIPX_BIN_DIR: /home/runner/.local/bin
-
-      - name: Check poetry is installed correctly
-        run: poetry env info
-
-      - name: Set up Python
-        id: setup-python
-        uses: actions/setup-python@v5
+      # https://github.com/astral-sh/setup-uv
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v5
         with:
-          python-version: '3.12'
-          cache: 'poetry'
+          version: "latest"
+          python-version: "3.12"
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+          pyproject-file: "pyproject.toml"
 
-      - name: Configure poetry
-        run: poetry env use "${{ steps.setup-python.outputs.python-path }}"
+      - name: Check uv is installed correctly
+        run: uv version
 
       - name: Install deps
-        run: poetry install --sync
+        run: uv sync --locked
 
       - name: Run Testcontainers container tests (in PyTest)
         run: |
           set -Eeuxo pipefail
-          poetry run pytest --capture=fd tests/containers -m 'not openshift' --image="${{ steps.calculated_vars.outputs.OUTPUT_IMAGE }}"
+          uv run pytest --capture=fd tests/containers -m 'not openshift' --image="${{ steps.calculated_vars.outputs.OUTPUT_IMAGE }}"
         env:
           DOCKER_HOST: "unix:///var/run/podman/podman.sock"
           TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE: "/var/run/podman/podman.sock"
@@ -511,7 +502,7 @@ jobs:
         if: ${{ steps.have-tests.outputs.tests == 'true' }}
         run: |
           set -Eeuxo pipefail
-          poetry run pytest --capture=fd tests/containers -m 'openshift' --image="${{ steps.calculated_vars.outputs.OUTPUT_IMAGE }}"
+          uv run pytest --capture=fd tests/containers -m 'openshift' --image="${{ steps.calculated_vars.outputs.OUTPUT_IMAGE }}"
         env:
           # TODO(jdanek): this Testcontainers stuff should not be necessary but currently it has to be there
           DOCKER_HOST: "unix:///var/run/podman/podman.sock"

.github/workflows/build-notebooks-pr-rhel.yaml

@@ -14,7 +14,7 @@ permissions:
 env:
   # language=json
   contributors: |
-    ["atheo89", "andyatmiami", "caponetto", "daniellutz", "dibryant", "harshad16", "jesuino", "jiridanek", "jstourac", "paulovmr"]
+    ["atheo89", "andyatmiami", "caponetto", "daniellutz", "dibryant", "harshad16", "jesuino", "jiridanek", "jstourac", "paulovmr", "Fiona-Waters"]
 
 jobs:
   gen:

.github/workflows/code-quality.yaml

@@ -31,49 +31,31 @@ jobs:
 
   pytest-tests:
     runs-on: ubuntu-latest
-    env:
-      poetry_version: '1.8.3'
     steps:
       - uses: actions/checkout@v4
 
-      - name: Cache poetry in ~/.local
-        uses: actions/cache/restore@v4
-        id: cache-poetry-restore
+      # https://github.com/astral-sh/setup-uv
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v5
         with:
-          path: ~/.local
-          key: "${{ runner.os }}-local-${{ env.poetry_version }}"
-
-      - name: Install poetry
-        if: steps.cache-poetry-restore.outputs.cache-hit != 'true'
-        run: pipx install poetry==${{ env.poetry_version }}
-        env:
-          PIPX_HOME: /home/runner/.local/pipx
-          PIPX_BIN_DIR: /home/runner/.local/bin
-
-      - name: Check poetry is installed correctly
-        run: poetry env info
-
-      - name: Save cache
-        if: steps.cache-poetry-restore.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: ~/.local
-          key: ${{ steps.cache-poetry-restore.outputs.cache-primary-key }}
-
-      - name: Set up Python
-        id: setup-python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-          cache: 'poetry'
+          version: "latest"
+          python-version: "3.12"
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+          pyproject-file: "pyproject.toml"
 
-      - name: Configure poetry
-        run: poetry env use "${{ steps.setup-python.outputs.python-path }}"
+      - name: Check uv is installed correctly
+        run: uv version
 
       - name: Install deps
-        run: poetry install --sync
+        run: uv sync --locked
+
+      # https://github.com/pre-commit/action
+      - name: Run pre-commit on all files
+        run: |
+          uv run pre-commit run --all-files
 
-      - run: poetry run pytest
+      - run: uv run pytest
 
   code-static-analysis:
     runs-on: ubuntu-latest
@@ -125,23 +107,7 @@ jobs:
           echo "Hadolint done"
 
       # This simply checks that the manifests and respective kustomization.yaml finishes without an error.
-      # Version of the kustomize that operator use in runtime to apply these changes is determined by:
-      # https://github.com/red-hat-data-services/rhods-operator/blob/7ccc405135f99c014982d7e297b8949e970dd750/go.mod#L28-L29
-      # and then to match appropriate kustomize release https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize%2Fv5.0.2
       - name: Check kustomize manifest
         id: kustomize-manifests
         run: |
-          KUSTOMIZE_VERSION=5.0.2
-          wget "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz"
-          tar -xvf kustomize*
-
-          ./kustomize version
-          echo "----------------------------------------------------------"
-          echo "Starting './kustomize build manifests/base'"
-          echo "----------------------------------------------------------"
-          ./kustomize build manifests/base
-
-          echo "----------------------------------------------------------"
-          echo "Starting './kustomize build manifests/overlays/additional'"
-          echo "----------------------------------------------------------"
-          ./kustomize build manifests/overlays/additional
+          ./ci/kustomize.sh

.github/workflows/docs.yaml

@@ -18,44 +18,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Cache poetry in ~/.local
-        uses: actions/cache/restore@v4
-        id: cache-poetry-restore
+      # https://github.com/astral-sh/setup-uv
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v5
         with:
-          path: ~/.local
-          key: "${{ runner.os }}-local-${{ env.poetry_version }}"
-
-      - name: Install poetry
-        if: steps.cache-poetry-restore.outputs.cache-hit != 'true'
-        run: pipx install poetry==${{ env.poetry_version }}
-        env:
-          PIPX_HOME: /home/runner/.local/pipx
-          PIPX_BIN_DIR: /home/runner/.local/bin
-
-      - name: Check poetry is installed correctly
-        run: poetry env info
-
-      - name: Save cache
-        if: steps.cache-poetry-restore.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: ~/.local
-          key: ${{ steps.cache-poetry-restore.outputs.cache-primary-key }}
-
-      - name: Set up Python
-        id: setup-python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-          cache: 'poetry'
-
-      - name: Configure poetry
-        run: poetry env use "${{ steps.setup-python.outputs.python-path }}"
-
-      - name: Install deps
-        run: poetry install --sync
+          version: "latest"
+          python-version: "3.12"
+          enable-cache: true
+          cache-dependency-glob: "uv.lock"
+          pyproject-file: "pyproject.toml"
 
       - name: Run the release notes script
         run: |
           set -Eeuxo pipefail
-          poetry run ci/package_versions.py | tee ${GITHUB_STEP_SUMMARY}
+          uv run ci/package_versions.py | tee ${GITHUB_STEP_SUMMARY}

.github/workflows/notebooks-digest-updater.yaml

@@ -1,7 +1,7 @@
 ---
 # The aim of this GitHub workflow is to update the params.env and commit.env files
 # This GHA works for both orgs and it checks for the tags generated from the main branch.
-name: Update Notebook Images and Commits With New SHAs
+name: Update Notebook and Runtime Images as well as the Commits With New SHAs
 on:  # yamllint disable-line rule:truthy
   workflow_dispatch:
     inputs:
@@ -54,42 +54,60 @@ jobs:
           ref: ${{ env.TMP_BRANCH }}
           fetch-depth: 0
 
-      - name: Invoke script to handle the updates
+      - name: Invoke ci/sha-digest-updater.sh script to handle the updates
         shell: bash
         run: |
-          bash "${GITHUB_WORKSPACE}/ci/notebooks-digest-updater.sh" "${{ env.USER_HASH }}" "${{ env.REPO_ORG }}" "${{ env.BRANCH_NAME }}" "${{ env.REPO_NAME }}"
+          bash "${GITHUB_WORKSPACE}/ci/sha-digest-updater.sh" "${{ env.USER_HASH }}" "${{ env.REPO_ORG }}" "${{ env.BRANCH_NAME }}" "${{ env.REPO_NAME }}"
 
       - name: Commit Changes
         run: |
 
           if [[ $(git status --porcelain | wc -l) -gt 0 ]]; then
             git fetch origin ${{ env.TMP_BRANCH }} && \
             git pull origin ${{ env.TMP_BRANCH }} && \
-            git add "${GITHUB_WORKSPACE}/manifests/base/params.env" && \
-            git commit -m "Update images digest hashes via ${{ env.TMP_BRANCH }} GitHub action" && \
-            git add ""${GITHUB_WORKSPACE}/manifests/base/commit.env"" && \
-            git commit -m "Update image commits via ${{ env.TMP_BRANCH }} GitHub action" &&\
+            git add manifests/base/  && \
+            git commit -m "Update image related sha digests via notebooks-digest-updater GitHub action" && \
             git push origin ${{ env.TMP_BRANCH }}
           else
             echo "There were no changes detected in the images for the ${{ env.BRANCH_NAME }}"
           fi
 
+      - name: Capture skipped images log (if any)
+        id: skipped_log
+        run: |
+          if [[ -f ${GITHUB_WORKSPACE}/skipped-images.txt && -s ${GITHUB_WORKSPACE}/skipped-images.txt ]]; then
+            echo "Found skipped images. Preparing message."
+            echo 'log<<EOF' >> $GITHUB_OUTPUT
+            cat ${GITHUB_WORKSPACE}/skipped-images.txt >> $GITHUB_OUTPUT
+            echo 'EOF' >> $GITHUB_OUTPUT
+          else
+            echo "log=" >> $GITHUB_OUTPUT
+          fi
+
       - name: pull-request
         run: |
+
+            body="${PR_BODY}"
+
+            if [[ -n "${{ steps.skipped_log.outputs.log }}" ]]; then
+              body+="
+
+              :warning: The following images were skipped during update, please push them manually or retriger the GitHub action:
+              ${{ steps.skipped_log.outputs.log }}
+              "
+            fi
+
             gh pr create --repo https://github.com/$REPO_ORG/$REPO_NAME.git \
-              --title "$pr_title" \
-              --body "$pr_body" \
+              --title "$PR_TITLE" \
+              --body "$body" \
               --head $REPO_ORG:${{ env.TMP_BRANCH }} \
               --base ${{ env.BRANCH_NAME }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          pr_title: "[Notebooks Updater Action] Update Notebook Images and commit with new SHAs"
-          pr_body: |
+          PR_TITLE: "[Updater Action] Update Notebook and Runtime Images as well as the Commits With New SHAs"
+          PR_BODY: |
             :rocket: This is an automated Pull Request.
             Created by `/.github/workflows/notebooks-digest-updater.yaml`
-
-            This PR updates the following files:
             - `manifests/base/params.env` file with the latest updated SHA digests of the notebooks.
+            - `manifests/base/runtime-*.yamls` file with the latest updated SHA digests of the runtimes.
             - `manifests/base/commit.env` file with the latest commit.
-
-            :exclamation: **IMPORTANT NOTE**: Remember to delete the `${{ env.TMP_BRANCH }}` branch after merging the changes

.github/workflows/params-env.yaml

@@ -8,6 +8,7 @@ on:  # yamllint disable-line rule:truthy
       - 'manifests/base/params.env'
       - 'ci/check-params-env.sh'
       - 'ci/check-runtime-images.sh'
+      - 'manifests/base/runtime-*-imagestream.yaml'
   workflow_dispatch:
 
 permissions: