Skip to content

Commit 0dd6b64

Browse files
Wei WengWei Weng
authored andcommitted
remove from unused make targets
Signed-off-by: Wei Weng <[email protected]>
1 parent a64aa65 commit 0dd6b64

File tree

1 file changed

+1
-84
lines changed

1 file changed

+1
-84
lines changed

Makefile

Lines changed: 1 addition & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -132,24 +132,6 @@ fmt: $(GOIMPORTS) ## Run go fmt against code.
132132
vet: ## Run go vet against code.
133133
go vet ./...
134134

135-
## --------------------------------------
136-
## Kind
137-
## --------------------------------------
138-
139-
# Note that these targets are only used for E2E tests of the v1alpha1 API.
140-
141-
create-hub-kind-cluster:
142-
kind create cluster --name $(HUB_KIND_CLUSTER_NAME) --image=$(KIND_IMAGE) --config=$(CLUSTER_CONFIG) --kubeconfig=$(KUBECONFIG)
143-
144-
create-member-kind-cluster:
145-
kind create cluster --name $(MEMBER_KIND_CLUSTER_NAME) --image=$(KIND_IMAGE) --config=$(CLUSTER_CONFIG) --kubeconfig=$(KUBECONFIG)
146-
147-
load-hub-docker-image:
148-
kind load docker-image --name $(HUB_KIND_CLUSTER_NAME) $(REGISTRY)/$(HUB_AGENT_IMAGE_NAME):$(HUB_AGENT_IMAGE_VERSION)
149-
150-
load-member-docker-image:
151-
kind load docker-image --name $(MEMBER_KIND_CLUSTER_NAME) $(REGISTRY)/$(REFRESH_TOKEN_IMAGE_NAME):$(REFRESH_TOKEN_IMAGE_VERSION) $(REGISTRY)/$(MEMBER_AGENT_IMAGE_NAME):$(MEMBER_AGENT_IMAGE_VERSION)
152-
153135
## --------------------------------------
154136
## test
155137
## --------------------------------------
@@ -175,56 +157,10 @@ integration-test: $(ENVTEST) ## Run tests.
175157
export CGO_ENABLED=1 && \
176158
export KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" && \
177159
ginkgo -v -p --race --cover --coverpkg=./pkg/scheduler/... ./test/scheduler && \
178-
ginkgo -v -p --race --cover --coverpkg=./... ./test/apis/... -coverprofile=it-coverage.xml
160+
ginkgo -v -p --race --cover --coverpkg=./... ./test/apis/...
179161

180162
## local tests & e2e tests
181163

182-
install-hub-agent-helm:
183-
kind export kubeconfig --name $(HUB_KIND_CLUSTER_NAME)
184-
helm install hub-agent ./charts/hub-agent/ \
185-
--set image.pullPolicy=Never \
186-
--set image.repository=$(REGISTRY)/$(HUB_AGENT_IMAGE_NAME) \
187-
--set image.tag=$(HUB_AGENT_IMAGE_VERSION) \
188-
--set logVerbosity=5 \
189-
--set namespace=fleet-system \
190-
--set enableWebhook=true \
191-
--set webhookServiceName=fleetwebhook \
192-
--set webhookClientConnectionType=service \
193-
--set enableV1Alpha1APIs=true \
194-
--set enableV1Beta1APIs=false \
195-
--set enableClusterInventoryAPI=true \
196-
--set logFileMaxSize=1000000
197-
198-
.PHONY: e2e-v1alpha1-hub-kubeconfig-secret
199-
e2e-v1alpha1-hub-kubeconfig-secret:
200-
kind export kubeconfig --name $(HUB_KIND_CLUSTER_NAME)
201-
kubectl apply -f test/e2e/v1alpha1/hub-agent-sa-secret.yaml
202-
TOKEN=$$(kubectl get secret hub-kubeconfig-secret -n fleet-system -o jsonpath='{.data.token}' | base64 -d) ;\
203-
kind export kubeconfig --name $(MEMBER_KIND_CLUSTER_NAME) ;\
204-
kubectl delete secret hub-kubeconfig-secret --ignore-not-found ;\
205-
kubectl create secret generic hub-kubeconfig-secret --from-literal=token=$$TOKEN
206-
207-
install-member-agent-helm: install-hub-agent-helm e2e-v1alpha1-hub-kubeconfig-secret
208-
kind export kubeconfig --name $(HUB_KIND_CLUSTER_NAME)
209-
## Get kind cluster IP that docker uses internally so we can talk to the other cluster. the port is the default one.
210-
HUB_SERVER_URL="https://$$(docker inspect $(HUB_KIND_CLUSTER_NAME)-control-plane --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'):6443" ;\
211-
kind export kubeconfig --name $(MEMBER_KIND_CLUSTER_NAME) ;\
212-
helm install member-agent ./charts/member-agent/ \
213-
--set config.hubURL=$$HUB_SERVER_URL \
214-
--set image.repository=$(REGISTRY)/$(MEMBER_AGENT_IMAGE_NAME) \
215-
--set image.tag=$(MEMBER_AGENT_IMAGE_VERSION) \
216-
--set refreshtoken.repository=$(REGISTRY)/$(REFRESH_TOKEN_IMAGE_NAME) \
217-
--set refreshtoken.tag=$(REFRESH_TOKEN_IMAGE_VERSION) \
218-
--set image.pullPolicy=Never --set refreshtoken.pullPolicy=Never \
219-
--set config.memberClusterName="kind-$(MEMBER_KIND_CLUSTER_NAME)" \
220-
--set logVerbosity=5 \
221-
--set namespace=fleet-system
222-
# to make sure member-agent reads the token file.
223-
kubectl delete pod --all -n fleet-system
224-
225-
.PHONY: create-kind-cluster
226-
create-kind-cluster: create-hub-kind-cluster create-member-kind-cluster install-helm
227-
228164
.PHONY: install-helm
229165
install-helm: load-hub-docker-image load-member-docker-image install-member-agent-helm
230166

@@ -366,25 +302,6 @@ clean-bin: ## Remove all generated binaries
366302
rm -rf $(TOOLS_BIN_DIR)
367303
rm -rf ./bin
368304

369-
# Note that these targets are only used for E2E tests of the v1alpha1 API.
370-
371-
.PHONY: uninstall-helm
372-
uninstall-helm: clean-testing-resources
373-
kind export kubeconfig --name $(HUB_KIND_CLUSTER_NAME)
374-
helm uninstall hub-agent
375-
376-
kind export kubeconfig --name $(MEMBER_KIND_CLUSTER_NAME)
377-
helm uninstall member-agent
378-
379-
.PHONY: clean-testing-resources
380-
clean-testing-resources:
381-
kind export kubeconfig --name $(HUB_KIND_CLUSTER_NAME)
382-
kubectl delete ns fleet-member-kind-member-testing --ignore-not-found
383-
kubectl delete memberclusters.fleet.azure.com kind-$(MEMBER_KIND_CLUSTER_NAME) --ignore-not-found
384-
385-
kind export kubeconfig --name $(MEMBER_KIND_CLUSTER_NAME)
386-
kubectl delete ns fleet-member-kind-member-testing --ignore-not-found
387-
388305
.PHONY: clean-e2e-tests
389306
clean-e2e-tests:
390307
cd ./test/e2e && chmod +x ./stop.sh && ./stop.sh $(MEMBER_CLUSTER_COUNT)

0 commit comments

Comments
 (0)