fix makefile targets
This would create several targets which didn't incorporate any version numbers and so wouldn't be updated when version numbers were changed. There were also non-make-ey ways of doings things like variables and folder creation. This also bumps the version of the kubebuilder tools we use Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
This commit is contained in:
parent
4b95398155
commit
84de98442a
1 changed files with 21 additions and 18 deletions
39
Makefile
39
Makefile
|
@ -7,36 +7,39 @@ IMAGE_TAG := "latest"
|
||||||
|
|
||||||
OUT := $(shell pwd)/_out
|
OUT := $(shell pwd)/_out
|
||||||
|
|
||||||
KUBE_VERSION=1.25.0
|
KUBEBUILDER_VERSION=1.28.0
|
||||||
|
|
||||||
$(shell mkdir -p "$(OUT)")
|
HELM_FILES := $(shell find deploy/example-webhook)
|
||||||
export TEST_ASSET_ETCD=_test/kubebuilder/etcd
|
|
||||||
export TEST_ASSET_KUBE_APISERVER=_test/kubebuilder/kube-apiserver
|
|
||||||
export TEST_ASSET_KUBECTL=_test/kubebuilder/kubectl
|
|
||||||
|
|
||||||
test: _test/kubebuilder
|
test: _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl
|
||||||
|
TEST_ASSET_ETCD=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd \
|
||||||
|
TEST_ASSET_KUBE_APISERVER=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver \
|
||||||
|
TEST_ASSET_KUBECTL=_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl \
|
||||||
$(GO) test -v .
|
$(GO) test -v .
|
||||||
|
|
||||||
_test/kubebuilder:
|
_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH).tar.gz: | _test
|
||||||
curl -fsSL https://go.kubebuilder.io/test-tools/$(KUBE_VERSION)/$(OS)/$(ARCH) -o kubebuilder-tools.tar.gz
|
curl -fsSL https://go.kubebuilder.io/test-tools/$(KUBEBUILDER_VERSION)/$(OS)/$(ARCH) -o $@
|
||||||
mkdir -p _test/kubebuilder
|
|
||||||
tar -xvf kubebuilder-tools.tar.gz
|
|
||||||
mv kubebuilder/bin/* _test/kubebuilder/
|
|
||||||
rm kubebuilder-tools.tar.gz
|
|
||||||
rm -R kubebuilder
|
|
||||||
|
|
||||||
clean: clean-kubebuilder
|
_test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/etcd _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kube-apiserver _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)/kubectl: _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH).tar.gz | _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH)
|
||||||
|
tar xfO $< kubebuilder/bin/$(notdir $@) > $@ && chmod +x $@
|
||||||
|
|
||||||
clean-kubebuilder:
|
.PHONY: clean
|
||||||
rm -Rf _test/kubebuilder
|
clean:
|
||||||
|
rm -r _test $(OUT)
|
||||||
|
|
||||||
|
.PHONY: build
|
||||||
build:
|
build:
|
||||||
docker build -t "$(IMAGE_NAME):$(IMAGE_TAG)" .
|
docker build -t "$(IMAGE_NAME):$(IMAGE_TAG)" .
|
||||||
|
|
||||||
.PHONY: rendered-manifest.yaml
|
.PHONY: rendered-manifest.yaml
|
||||||
rendered-manifest.yaml:
|
rendered-manifest.yaml: $(OUT)/rendered-manifest.yaml
|
||||||
|
|
||||||
|
$(OUT)/rendered-manifest.yaml: $(HELM_FILES) | $(OUT)
|
||||||
helm template \
|
helm template \
|
||||||
--name example-webhook \
|
--name example-webhook \
|
||||||
--set image.repository=$(IMAGE_NAME) \
|
--set image.repository=$(IMAGE_NAME) \
|
||||||
--set image.tag=$(IMAGE_TAG) \
|
--set image.tag=$(IMAGE_TAG) \
|
||||||
deploy/example-webhook > "$(OUT)/rendered-manifest.yaml"
|
deploy/example-webhook > $@
|
||||||
|
|
||||||
|
_test $(OUT) _test/kubebuilder-$(KUBEBUILDER_VERSION)-$(OS)-$(ARCH):
|
||||||
|
mkdir -p $@
|
||||||
|
|
Loading…
Reference in a new issue