updated make targets for simplicity

Signed-off-by: Michael Wilkerson <mwilkerson@hashicorp.com>

testing/README.MD

@@ -10,7 +10,7 @@ This is for building and testing argo rollout integrations with Consul. For simp
 6. Update any of the necessary variables in the `Makefile` to match your environment
 
 # Verify v1 to v2 rollout
-1. Run `make setup` to setup the system with the static-server/client, consul and argo.
+1. Run `make setup` to setup the system with the static-server/client, consul and argo. This will also build the latest plugin.
    - Everything is installed to the `default` namespace except for Argo gets installed in the `argo` namespace.
 2. Run `make check-service-splitter` and `make check-service-resolver`, we will run these scripts periodically throughout the testing scenarios
    - service-splitter: shows 100% of traffic directed to stable

testing/makefile

@@ -1,6 +1,6 @@
 KUBERNETES_VERSION = v1.25.11
 CONSUL_K8S_CHART_VERSION = 1.3.1
-PLUGIN_DIR=~/dev/rollouts-plugin-trafficrouter-consul
+PLUGIN_DIR= $(shell realpath ../)
 
 ### SETUP KIND CLUSTER WITH CONSUL
 # setup sets up the kind cluster and deploys the consul helm chart
@@ -41,8 +41,17 @@ apply-crds:
 	-f resources/service-splitter.yaml \
 	-f resources/canary-rollout.yaml
 
+real-path:
+	@echo $(shell realpath ../)
+
+update-kind-config:
+	./scripts/update-kind-config.sh ./resources/kind_config.yaml $(PLUGIN_DIR)
+
+build-plugin:
+	make -C $(PLUGIN_DIR) build
+
 ### Test Verification
-setup: consul-setup argo-setup
+setup: build-plugin update-kind-config consul-setup argo-setup
 
 # Command for checking how the service is being split by running curl from inside a client pod
 splitting-watch:

testing/resources/kind_config.yaml

@@ -4,4 +4,4 @@ nodes:
   - role: control-plane
     extraMounts:
       - hostPath: /Users/mwilkerson/dev/rollouts-plugin-trafficrouter-consul
-        containerPath: /rollouts-plugin-trafficrouter-consul
+        containerPath: /rollouts-plugin-trafficrouter-consul