Skip to content
This repository has been archived by the owner on Dec 16, 2024. It is now read-only.

Commit

Permalink
refactor: remove istioctl
Browse files Browse the repository at this point in the history
  • Loading branch information
mikenairn committed Feb 22, 2024
1 parent 972f32b commit eecbc82
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ local-setup-kind: kind ## Setup kind clusters for multi cluster traffic controll
./hack/local-setup-kind.sh

.PHONY: local-setup-mgc
local-setup-mgc: kustomize helm yq istioctl operator-sdk clusteradm ## Setup multi cluster traffic controller locally onto kind clusters.
local-setup-mgc: kustomize helm yq operator-sdk clusteradm ## Setup multi cluster traffic controller locally onto kind clusters.
./hack/local-setup-mgc.sh

.PHONY: local-cleanup
Expand Down
1 change: 0 additions & 1 deletion hack/.binEnv
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export KIND_BIN="${BIN_DIR}kind"
export KUSTOMIZE_BIN="${BIN_DIR}kustomize"
export HELM_BIN="${BIN_DIR}helm"
export YQ_BIN="${BIN_DIR}yq"
export ISTIOCTL_BIN="${BIN_DIR}istioctl"
export OPERATOR_SDK_BIN="${BIN_DIR}operator-sdk"
export CLUSTERADM_BIN="${BIN_DIR}clusteradm"
export KFILT="docker run --rm -i ryane/kfilt"
12 changes: 1 addition & 11 deletions hack/make/dependencies.make
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
ENVTEST ?= $(LOCALBIN)/setup-envtest
KIND ?= $(LOCALBIN)/kind
HELM ?= $(LOCALBIN)/helm
ISTIOCTL ?= $(LOCALBIN)/istioctl
OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
CLUSTERADM ?= $(LOCALBIN)/clusteradm
GINKGO ?= $(LOCALBIN)/ginkgo
Expand All @@ -28,14 +27,13 @@ CONTROLLER_TOOLS_VERSION ?= v0.10.0
KIND_VERSION ?= v0.17.0
HELM_VERSION ?= v3.10.0
YQ_VERSION ?= v4.30.8
ISTIOVERSION ?= 1.20.0
OPERATOR_SDK_VERSION ?= 1.28.0
CLUSTERADM_VERSION ?= 0.6.0
GINKGO_VERSION ?= v2.13.2
OPENSHIFT_GOIMPORTS_VERSION ?= c70783e636f2213cac683f6865d88c5edace3157

.PHONY: dependencies
dependencies: kustomize operator-sdk controller-gen envtest kind helm yq istioctl clusteradm ginkgo
dependencies: kustomize operator-sdk controller-gen envtest kind helm yq clusteradm ginkgo
@echo "dependencies installed successfully"
@echo "consider running `export PATH=$PATH:$(pwd)/bin` if you haven't already done"

Expand Down Expand Up @@ -88,14 +86,6 @@ yq: $(YQ)
$(YQ):
test -s $(YQ) || GOBIN=$(LOCALBIN) go install github.com/mikefarah/yq/v4@$(YQ_VERSION)

.PHONY: istioctl
istioctl: $(ISTIOCTL)
$(ISTIOCTL):
$(eval ISTIO_TMP := $(shell mktemp -d))
cd $(ISTIO_TMP); curl -sSL https://istio.io/downloadIstio | ISTIO_VERSION=$(ISTIOVERSION) sh -
cp $(ISTIO_TMP)/istio-$(ISTIOVERSION)/bin/istioctl ${ISTIOCTL}
-rm -rf $(ISTIO_TMP)

.PHONY: clusteradm
clusteradm: $(CLUSTERADM)
$(CLUSTERADM):
Expand Down

0 comments on commit eecbc82

Please sign in to comment.