Skip to content

Commit

Permalink
Drop unneeded kustomize tool
Browse files Browse the repository at this point in the history
  • Loading branch information
timebertt committed Sep 7, 2023
1 parent ba3f4cd commit 2ecd03d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
4 changes: 2 additions & 2 deletions webhosting-operator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ kind-down: $(KIND) ## Tear down the kind testing cluster.
$(KIND) delete cluster --name webhosting

.PHONY: deploy-ingress-nginx
deploy-ingress-nginx: $(KUSTOMIZE) $(KUBECTL) ## Deploy ingress-nginx to K8s cluster specified in $KUBECONFIG.
deploy-ingress-nginx: $(KUBECTL) ## Deploy ingress-nginx to K8s cluster specified in $KUBECONFIG.
@# job template is immutable, delete old jobs to prepare for upgrade
$(KUBECTL) -n ingress-nginx delete job --ignore-not-found ingress-nginx-admission-create ingress-nginx-admission-patch
$(KUSTOMIZE) build config/ingress-nginx/$(OVERLAY) | $(KUBECTL) apply --server-side -f -
$(KUBECTL) apply --server-side -k config/ingress-nginx/$(OVERLAY)
$(KUBECTL) -n ingress-nginx wait deploy ingress-nginx-controller --for=condition=Available --timeout=2m

# use static label for skaffold to prevent rolling all components on every skaffold invocation
Expand Down
5 changes: 0 additions & 5 deletions webhosting-operator/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ $(KUBECTL): $(call tool_version_file,$(KUBECTL),$(KUBECTL_VERSION))
curl -Lo $(KUBECTL) https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/$(shell uname -s | tr '[:upper:]' '[:lower:]')/$(shell uname -m | sed 's/x86_64/amd64/')/kubectl
chmod +x $(KUBECTL)

KUSTOMIZE := $(TOOLS_BIN_DIR)/kustomize
KUSTOMIZE_VERSION ?= v5.1.0
$(KUSTOMIZE): $(call tool_version_file,$(KUSTOMIZE),$(KUSTOMIZE_VERSION))
GOBIN=$(abspath $(TOOLS_BIN_DIR)) go install sigs.k8s.io/kustomize/kustomize/v5@$(KUSTOMIZE_VERSION)

KYVERNO := $(TOOLS_BIN_DIR)/kyverno
KYVERNO_VERSION ?= v1.10.3
$(KYVERNO): $(call tool_version_file,$(KYVERNO),$(KYVERNO_VERSION))
Expand Down

0 comments on commit 2ecd03d

Please sign in to comment.