Skip to content

Commit

Permalink
Update kubectl versions and add 1.23
Browse files Browse the repository at this point in the history
Updated all `kubectl` baselines to their latest patch releases.

* `1.19.15` -> `1.19.16`
* `1.20.11` -> `1.20.15`
* `1.21.5`  -> `1.21.9`
* `1.22.2`  -> `1.22.6`

And added a new release with `1.23.3`.
  • Loading branch information
Justin Griffin committed Jan 27, 2022
1 parent 07b6145 commit 4c60292
Showing 1 changed file with 19 additions and 15 deletions.
34 changes: 19 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ COLOR_WHITE=\033[0;37m
COLOR_RESET=\033[0m

KUBECTL_1.18=1.18.19
KUBECTL_1.19=1.19.15
KUBECTL_1.20=1.20.11
KUBECTL_1.21=1.21.5
KUBECTL_1.22=1.22.2
KUBECTL_1.19=1.19.16
KUBECTL_1.20=1.20.15
KUBECTL_1.21=1.21.9
KUBECTL_1.22=1.22.6
KUBECTL_1.23=1.23.3

KUBECTL_VERSION=${KUBECTL_1.20}
KUBECTL_VERSION=${KUBECTL_1.23}

IMAGE=jgriff/k8s-resource
VERSION=dev
Expand All @@ -37,15 +38,16 @@ VERSION=dev
# ---------------------------------------------------------------------------------------
# build
# ---------------------------------------------------------------------------------------
.PHONY: build build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_latest
build: build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_latest
.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
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.18 build_1.19 build_1.20 build_1.21 build_1.22: TAG=${VERSION}-kubectl-${KUBECTL_VERSION}
build_1.18 build_1.19 build_1.20 build_1.21 build_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:
@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:
Expand All @@ -56,15 +58,16 @@ build_latest:
# ---------------------------------------------------------------------------------------
# test
# ---------------------------------------------------------------------------------------
.PHONY: test test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_latest
test: test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_latest
.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
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_latest: TAG=latest
test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_latest:
test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_1.23 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

Expand All @@ -76,15 +79,16 @@ test_shell:
# ---------------------------------------------------------------------------------------
# release
# ---------------------------------------------------------------------------------------
.PHONY: release release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_latest
release: release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_latest
.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
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_latest: TAG=latest
release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_latest:
release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_1.23 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 ) .
Expand Down

0 comments on commit 4c60292

Please sign in to comment.