Remove ../calico

Author: caseydavenport

node/Makefile

@@ -341,8 +341,8 @@ test_image: .calico_test.created
 	$(DOCKER_BUILD) --build-arg ETCD_VERSION=$(ETCD_VERSION) -f calico_test/Dockerfile -t $(TEST_CONTAINER_NAME) calico_test
 	touch $@
 
-chart: ../calico/bin/tigera-operator-$(GIT_VERSION).tgz
-../calico/bin/tigera-operator-$(GIT_VERSION).tgz:
+chart: ../bin/tigera-operator-$(GIT_VERSION).tgz
+../bin/tigera-operator-$(GIT_VERSION).tgz:
 	make -C ../ bin/tigera-operator-$(GIT_VERSION).tgz
 
 calico-node.tar: $(NODE_CONTAINER_CREATED)
@@ -408,7 +408,7 @@ k8s-test:
 	$(MAKE) kind-k8st-cleanup
 
 .PHONY: kind-k8st-setup
-kind-k8st-setup: $(K8ST_IMAGE_TARS) ../calico/bin/tigera-operator-$(GIT_VERSION).tgz kind-cluster-create
+kind-k8st-setup: $(K8ST_IMAGE_TARS) ../bin/tigera-operator-$(GIT_VERSION).tgz kind-cluster-create
 	KUBECONFIG=$(KIND_KUBECONFIG) ARCH=$(ARCH) GIT_VERSION=$(GIT_VERSION) ./tests/k8st/deploy_resources_on_kind_cluster.sh
 
 .PHONY: kind-k8st-run-test

node/tests/k8st/infra/build-operator.sh

@@ -7,6 +7,8 @@
 set -e
 REPO=${REPO:-tigera/operator}
 BRANCH=${BRANCH:-master}
+
+rm -rf operator/
 echo "Cloning https://github.com/${REPO} @ ${BRANCH}"
 git clone --depth=1 https://github.com/${REPO} -b ${BRANCH} operator