Merge pull request #33 from kubeflow/main

[pull] main from kubeflow:main
opendatahub-io · Mar 26, 2024 · 5612bee · 5612bee
2 parents dd093b7 + 36cc191
commit 5612bee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build-image-pr.yml b/.github/workflows/build-image-pr.yml
@@ -34,6 +34,8 @@ jobs:
         run: ./scripts/build_deploy.sh
       - name: Start Kind Cluster
         uses: helm/kind-action@v1.9.0
+        with:
+          node_image: "kindest/node:v1.27.11"
       - name: Load Local Registry Test Image
         env:
           IMG: "quay.io/${{ env.IMG_ORG }}/${{ env.IMG_REPO }}:${{ steps.tags.outputs.tag }}"

diff --git a/Makefile b/Makefile
@@ -194,11 +194,11 @@ proxy: build
 # login to docker
 .PHONY: docker/login
 docker/login:
-	ifdef IMG_REGISTRY
-		$(DOCKER) login -u "${DOCKER_USER}" -p "${DOCKER_PWD}" "${IMG_REGISTRY}"
-	else
-		$(DOCKER) login -u "${DOCKER_USER}" -p "${DOCKER_PWD}"
-	endif
+ifdef IMG_REGISTRY
+	$(DOCKER) login -u "${DOCKER_USER}" -p "${DOCKER_PWD}" "${IMG_REGISTRY}"
+else
+	$(DOCKER) login -u "${DOCKER_USER}" -p "${DOCKER_PWD}"
+endif
 
 
 # build docker image