Merge pull request #484 from harshad16/main

[2024a] sync release branch 2024a with the latest changes of main
opendatahub-io · Apr 5, 2024 · 3d5d0b6 · 3d5d0b6
2 parents 6f4c36b + e66dc95
commit 3d5d0b6
Show file tree

Hide file tree

Showing 34 changed files with 5,223 additions and 691 deletions.
diff --git a/.github/workflows/auto-add-issue-to-project.yml b/.github/workflows/auto-add-issue-to-project.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Generate github-app token
         id: app-token
-        uses: getsentry/action-github-app-token@v2
+        uses: getsentry/action-github-app-token@v3
         with:
           app_id: ${{ secrets.DEVOPS_APP_ID }}
           private_key: ${{ secrets.DEVOPS_APP_PRIVATE_KEY }}

diff --git a/.github/workflows/notebooks-digest-updater-upstream.yaml b/.github/workflows/notebooks-digest-updater-upstream.yaml
@@ -29,7 +29,7 @@ jobs:
 
       # Checkout the branch
       - name: Checkout branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.BRANCH_NAME }}
 
@@ -53,7 +53,7 @@ jobs:
 
       # Get the latest weekly build commit hash: https://github.com/opendatahub-io/notebooks/commits/2024a
       - name: Checkout upstream notebooks repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: opendatahub-io/notebooks.git
           ref: ${{ env.RELEASE_VERSION_N }}
@@ -66,7 +66,7 @@ jobs:
 
       # Checkout the release branch to apply the updates
       - name: Checkout release branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.DIGEST_UPDATER_BRANCH }}
 
@@ -111,7 +111,7 @@ jobs:
 
       # Get the latest weekly build commit hash: https://github.com/opendatahub-io/notebooks/commits/2023b
       - name: Checkout upstream notebooks repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: opendatahub-io/notebooks.git
           ref: ${{ env.RELEASE_VERSION_N_1 }}
@@ -124,7 +124,7 @@ jobs:
 
       # Checkout the release branch to apply the updates
       - name: Checkout release branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.DIGEST_UPDATER_BRANCH }}
 
@@ -164,7 +164,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: pull-request
         uses: repo-sync/pull-request@v2

diff --git a/.github/workflows/params-env.yaml b/.github/workflows/params-env.yaml
@@ -12,7 +12,7 @@ jobs:
   validation-of-params-env:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/piplock-renewal-2023a.yml b/.github/workflows/piplock-renewal-2023a.yml
@@ -21,14 +21,14 @@ jobs:
     steps:
       # Checkout the paricular branch
       - name: Checkout code from the release branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: 2023a
           token: ${{ secrets.GH_ACCESS_TOKEN }}
 
       # Setup Python environment
       - name: Setup Python environment
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: |
             3.8

diff --git a/.github/workflows/piplock-renewal-2023b.yml b/.github/workflows/piplock-renewal-2023b.yml
@@ -21,14 +21,14 @@ jobs:
     steps:
       # Checkout the paricular branch
       - name: Checkout code from the release branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: 2023b
           token: ${{ secrets.GH_ACCESS_TOKEN }}
 
       # Setup Python environment
       - name: Setup Python environment
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: |
             3.8

diff --git a/.github/workflows/pr-merge-image-delete.yml b/.github/workflows/pr-merge-image-delete.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: '0'
       - name: Install skopeo
@@ -23,7 +23,7 @@ jobs:
           sudo apt-get -y update
           sudo apt-get -y install skopeo
       - name: Get Pull Request Number
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         id: get_pr_number
         with:
           script: |

diff --git a/.github/workflows/sec-scan.yml b/.github/workflows/sec-scan.yml
@@ -28,7 +28,7 @@ jobs:
 
       # Checkout the branch
       - name: Checkout branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.BRANCH_NAME }}
 
@@ -52,7 +52,7 @@ jobs:
 
       # Get the latest weekly build commit hash: https://github.com/opendatahub-io/notebooks/commits/2023b
       - name: Checkout upstream notebooks repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: opendatahub-io/notebooks.git
           ref: ${{ env.RELEASE_VERSION_N }}
@@ -64,7 +64,7 @@ jobs:
           echo "HASH_N=$(git rev-parse --short HEAD)" >> ${GITHUB_OUTPUT}
 
       - name: Checkout "N - 1" branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: opendatahub-io/notebooks.git
           ref: ${{ env.RELEASE_VERSION_N_1 }}
@@ -76,7 +76,7 @@ jobs:
           echo "HASH_N_1=$(git rev-parse --short HEAD)" >> ${GITHUB_OUTPUT}
 
       - name: Checkout "main" branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: opendatahub-io/notebooks.git
           ref: main
@@ -89,12 +89,12 @@ jobs:
 
       # Checkout the release branch to apply the updates
       - name: Checkout release branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.SEC_SCAN_BRANCH }}
 
       - name: setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'  # install the python version needed
 
@@ -126,7 +126,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: pull-request
         uses: repo-sync/pull-request@v2

diff --git a/Makefile b/Makefile
@@ -1,7 +1,15 @@
-CONTAINER_ENGINE ?= podman
 IMAGE_REGISTRY   ?= quay.io/opendatahub/workbench-images
 RELEASE	 		 ?= 2023b
-DATE 			 ?= $(shell date +'%Y%m%d')
+
+# OS dependant: Generate date, select appropriate cmd to locate container engine
+ifeq ($(OS), Windows_NT)
+	DATE 		?= $(shell powershell -Command "Get-Date -Format 'yyyyMMdd'")
+	WHERE_WHICH ?= where
+else
+	DATE 		?= $(shell date +'%Y%m%d')
+	WHERE_WHICH ?= which
+endif
+
 IMAGE_TAG		 ?= $(RELEASE)_$(DATE)
 KUBECTL_BIN      ?= bin/kubectl
 KUBECTL_VERSION  ?= v1.23.11
@@ -10,6 +18,16 @@ REQUIRED_RUNTIME_IMAGE_COMMANDS="curl python3"
 REQUIRED_CODE_SERVER_IMAGE_COMMANDS="curl python oc code-server"
 REQUIRED_R_STUDIO_IMAGE_COMMANDS="curl python oc /usr/lib/rstudio-server/bin/rserver"
 
+# Detect and select the system's available container engine
+ifeq (, $(shell $(WHERE_WHICH) podman))
+	DOCKER := $(shell $(WHERE_WHICH) docker)
+	ifeq (, $(DOCKER))
+		$(error "Neither Docker nor Podman is installed. Please install one of them.")
+	endif
+	CONTAINER_ENGINE := docker
+else
+	CONTAINER_ENGINE := podman
+endif
 
 # Build function for the notebok image:
 #   ARG 1: Image tag name.
@@ -96,6 +114,11 @@ habana-jupyter-1.10.0-ubi8-python-3.8: jupyter-datascience-ubi8-python-3.8
 habana-jupyter-1.11.0-ubi8-python-3.8: jupyter-datascience-ubi8-python-3.8
 	$(call image,$@,habana/1.11.0/ubi8-python-3.8,$<)
 
+# Build and push habana-jupyter-1.13.0-ubi8-python-3.8 image to the registry
+.PHONY: habana-jupyter-1.13.0-ubi8-python-3.8
+habana-jupyter-1.13.0-ubi8-python-3.8: jupyter-datascience-ubi8-python-3.8
+	$(call image,$@,habana/1.13.0/ubi8-python-3.8,$<)
+
 # Build and push runtime-minimal-ubi8-python-3.8 image to the registry
 .PHONY: runtime-minimal-ubi8-python-3.8
 runtime-minimal-ubi8-python-3.8: base-ubi8-python-3.8