diff --git a/Makefile b/Makefile index e2703ef..f0e2c9e 100644 --- a/Makefile +++ b/Makefile @@ -15,11 +15,13 @@ COLOR_RESET=\033[0m KUBECTL_1.18=1.18.19 KUBECTL_1.19=1.19.16 KUBECTL_1.20=1.20.15 -KUBECTL_1.21=1.21.11 -KUBECTL_1.22=1.22.8 -KUBECTL_1.23=1.23.5 +KUBECTL_1.21=1.21.14 +KUBECTL_1.22=1.22.11 +KUBECTL_1.23=1.23.8 +KUBECTL_1.24=1.24.1 -KUBECTL_VERSION=${KUBECTL_1.23} + +KUBECTL_VERSION=${KUBECTL_1.24} IMAGE=jgriff/k8s-resource VERSION=dev @@ -38,16 +40,17 @@ VERSION=dev # --------------------------------------------------------------------------------------- # build # --------------------------------------------------------------------------------------- -.PHONY: build build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_1.23 build_latest -build: build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_1.23 build_latest +.PHONY: build build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_1.23 build_1.24 build_latest +build: build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_1.23 build_1.24 build_latest build_1.18: KUBECTL_VERSION=${KUBECTL_1.18} build_1.19: KUBECTL_VERSION=${KUBECTL_1.19} build_1.20: KUBECTL_VERSION=${KUBECTL_1.20} build_1.21: KUBECTL_VERSION=${KUBECTL_1.21} build_1.22: KUBECTL_VERSION=${KUBECTL_1.22} build_1.23: KUBECTL_VERSION=${KUBECTL_1.23} -build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_1.23: TAG=${VERSION}-kubectl-${KUBECTL_VERSION} -build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_1.23: +build_1.24: KUBECTL_VERSION=${KUBECTL_1.24} +build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_1.23 build_1.24: TAG=${VERSION}-kubectl-${KUBECTL_VERSION} +build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_1.23 build_1.24: @echo -e "\n[${COLOR_BLUE}build${COLOR_RESET}/${COLOR_TEAL}${TAG}${COLOR_RESET}] ${COLOR_ORANGE}Building image${COLOR_RESET}..." @docker build --build-arg KUBECTL_VERSION=${KUBECTL_VERSION} -t ${IMAGE}:${TAG} -t ${IMAGE}:$(shell echo ${TAG} | rev | cut -d '.' -f2- | rev ) . build_latest: @@ -58,16 +61,17 @@ build_latest: # --------------------------------------------------------------------------------------- # test # --------------------------------------------------------------------------------------- -.PHONY: test test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_1.23 test_latest -test: test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_1.23 test_latest +.PHONY: test test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_1.23 test_1.24 test_latest +test: test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_1.23 test_1.24 test_latest test_1.18: TAG=${VERSION}-kubectl-${KUBECTL_1.18} test_1.19: TAG=${VERSION}-kubectl-${KUBECTL_1.19} test_1.20: TAG=${VERSION}-kubectl-${KUBECTL_1.20} test_1.21: TAG=${VERSION}-kubectl-${KUBECTL_1.21} test_1.22: TAG=${VERSION}-kubectl-${KUBECTL_1.22} test_1.23: TAG=${VERSION}-kubectl-${KUBECTL_1.23} +test_1.24: TAG=${VERSION}-kubectl-${KUBECTL_1.24} test_latest: TAG=latest -test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_1.23 test_latest: +test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_1.23 test_1.24 test_latest: @echo -e "\n[${COLOR_BLUE}test${COLOR_RESET}/${COLOR_TEAL}${TAG}${COLOR_RESET}] ${COLOR_ORANGE}Testing image${COLOR_RESET}..." @./test/run.sh -i ${IMAGE}:${TAG} -v @@ -79,16 +83,17 @@ test_shell: # --------------------------------------------------------------------------------------- # release # --------------------------------------------------------------------------------------- -.PHONY: release release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_1.23 release_latest -release: release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_1.23 release_latest +.PHONY: release release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_1.23 release_1.24 release_latest +release: release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_1.23 release_1.24 release_latest release_1.18: TAG=${VERSION}-kubectl-${KUBECTL_1.18} release_1.19: TAG=${VERSION}-kubectl-${KUBECTL_1.19} release_1.20: TAG=${VERSION}-kubectl-${KUBECTL_1.20} release_1.21: TAG=${VERSION}-kubectl-${KUBECTL_1.21} release_1.22: TAG=${VERSION}-kubectl-${KUBECTL_1.22} release_1.23: TAG=${VERSION}-kubectl-${KUBECTL_1.23} +release_1.24: TAG=${VERSION}-kubectl-${KUBECTL_1.24} release_latest: TAG=latest -release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_1.23 release_latest: +release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_1.23 release_1.24 release_latest: @echo -e "\n[${COLOR_BLUE}release${COLOR_RESET}/${COLOR_TEAL}${TAG}${COLOR_RESET}] ${COLOR_ORANGE}Pushing image${COLOR_RESET}..." @docker buildx create --name k8s-resource-builder @docker buildx build --builder k8s-resource-builder --platform linux/amd64,linux/arm64/v8 --push --tag ${IMAGE}:$(shell echo ${TAG} | rev | cut -d '.' -f2- | rev ) .