From 81c51052bc2bc3cff83bba857475d3df1705fb10 Mon Sep 17 00:00:00 2001 From: Matteo Mortari Date: Tue, 26 Mar 2024 14:32:18 +0100 Subject: [PATCH 1/2] add specific K8s version when testing with Kind (#45) Signed-off-by: Matteo Mortari --- .github/workflows/build-image-pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-image-pr.yml b/.github/workflows/build-image-pr.yml index 185d380f..10730961 100644 --- 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: "${{ env.IMG_ORG }}/${{ env.IMG_REPO }}:${{ steps.tags.outputs.tag }}" From 36cc19145f7f43c4657c4b408186e702c280b094 Mon Sep 17 00:00:00 2001 From: Matteo Mortari Date: Tue, 26 Mar 2024 14:33:18 +0100 Subject: [PATCH 2/2] fix wrong indentation in makefile rule recipe (#51) Signed-off-by: Matteo Mortari --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f91225e9..24b1345d 100644 --- 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