Skip to content

Commit

Permalink
Add kubectl 1.25 and update baselines to latest patches (#34)
Browse files Browse the repository at this point in the history 
Added the `1.25` baseline to list ot `kubectl` versions we ship with,
currently targeting the latest patch `1.25.2`.  The `latest` image now
also ships with `1.25`.

Also updated the current baselines to their latest patch releases:
* `1.22.12` --> `1.22.15`
* `1.23.9` --> `1.23.12`
* `1.24.3` --> `1.24.6`
  • Loading branch information
Justin Griffin authored Oct 12, 2022
1 parent 1b661de commit 2ea4138
Showing 1 changed file with 18 additions and 14 deletions.
32 changes: 18 additions & 14 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ KUBECTL_1.18=1.18.19
KUBECTL_1.19=1.19.16
KUBECTL_1.20=1.20.15
KUBECTL_1.21=1.21.14
KUBECTL_1.22=1.22.12
KUBECTL_1.23=1.23.9
KUBECTL_1.24=1.24.3
KUBECTL_1.22=1.22.15
KUBECTL_1.23=1.23.12
KUBECTL_1.24=1.24.6
KUBECTL_1.25=1.25.2


KUBECTL_VERSION=${KUBECTL_1.24}
KUBECTL_VERSION=${KUBECTL_1.25}

IMAGE=jgriff/k8s-resource
VERSION=dev
Expand All @@ -40,17 +41,18 @@ VERSION=dev
# ---------------------------------------------------------------------------------------
# build
# ---------------------------------------------------------------------------------------
.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
.PHONY: build build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_1.23 build_1.24 build_1.25 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_1.25 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.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:
build_1.25: KUBECTL_VERSION=${KUBECTL_1.25}
build_1.18 build_1.19 build_1.20 build_1.21 build_1.22 build_1.23 build_1.24 build_1.25: 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 build_1.25:
@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 @@ -61,17 +63,18 @@ build_latest:
# ---------------------------------------------------------------------------------------
# test
# ---------------------------------------------------------------------------------------
.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
.PHONY: test test_1.18 test_1.19 test_1.20 test_1.21 test_1.22 test_1.23 test_1.24 test_1.25 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_1.25 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_1.25: TAG=${VERSION}-kubectl-${KUBECTL_1.25}
test_latest: TAG=latest
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 test_1.19 test_1.20 test_1.21 test_1.22 test_1.23 test_1.24 test_1.25 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 @@ -83,17 +86,18 @@ test_shell:
# ---------------------------------------------------------------------------------------
# release
# ---------------------------------------------------------------------------------------
.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
.PHONY: release release_1.18 release_1.19 release_1.20 release_1.21 release_1.22 release_1.23 release_1.24 release_1.25 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_1.25 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_1.25: TAG=${VERSION}-kubectl-${KUBECTL_1.25}
release_latest: TAG=latest
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 release_1.19 release_1.20 release_1.21 release_1.22 release_1.23 release_1.24 release_1.25 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 2ea4138

Please sign in to comment.