Add operator-local make command

Author: deliahu

Makefile

@@ -20,10 +20,29 @@ SHELL := /bin/bash
 
 # Cortex
 
+# build cli, start local operator, and watch for changes
 devstart:
 	@$(MAKE) operator-stop || true
 	@./dev/operator_local.sh || true
 
+.PHONY: cli
+cli:
+	@mkdir -p ./bin
+	@go build -o ./bin/cortex ./cli
+
+# build cli and watch for changes
+cli-watch:
+	@clear && echo "building cli..."
+	@$(MAKE) cli
+	@clear && echo -e "\033[1;32mCLI built\033[0m"
+	@watchmedo shell-command --command='clear && echo "rebuilding cli..." && go build -o ./bin/cortex ./cli && clear && echo "\033[1;32mCLI built\033[0m"' --patterns '*.go;*.yaml' --recursive --drop ./pkg ./cli
+
+# start local operator and watch for changes
+operator-local:
+	@$(MAKE) operator-stop || true
+	@./dev/operator_local.sh --operator-only || true
+
+# configure kubectl to point to the cluster specified in dev/config/cluster.yaml
 kubectl:
 	@eval $$(python3 ./manager/cluster_config_env.py ./dev/config/cluster.yaml) && eksctl utils write-kubeconfig --cluster="$$CORTEX_CLUSTER_NAME" --region="$$CORTEX_REGION" | grep -v "saved kubeconfig as" | grep -v "using region" | grep -v "eksctl version" || true
 
@@ -70,6 +89,7 @@ cluster-configure-y:
 	@kill $(shell pgrep -f make) >/dev/null 2>&1 || true
 	@./bin/cortex -c=./dev/config/cluster.yaml cluster configure --yes
 
+# stop the in-cluster operator
 operator-stop:
 	@$(MAKE) kubectl
 	@kubectl delete --namespace=default --ignore-not-found=true deployment operator
@@ -120,17 +140,6 @@ manager-local:
 
 # Misc
 
-.PHONY: cli
-cli:
-	@mkdir -p ./bin
-	@go build -o ./bin/cortex ./cli
-
-cli-watch:
-	@clear && echo "building cli..."
-	@$(MAKE) cli
-	@clear && echo -e "\033[1;32mCLI built\033[0m"
-	@watchmedo shell-command --command='clear && echo "rebuilding cli..." && go build -o ./bin/cortex ./cli && clear && echo "\033[1;32mCLI built\033[0m"' --patterns '*.go;*.yaml' --recursive --drop ./pkg ./cli
-
 aws-clear-bucket:
 	@./dev/aws.sh clear-bucket
 

dev/operator_local.sh

@@ -17,6 +17,8 @@
 
 set -euo pipefail
 
+arg1=${1:-""}
+
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)"
 
 kill $(pgrep -f make) >/dev/null 2>&1 || true
@@ -34,20 +36,40 @@ fi
 export CORTEX_OPERATOR_IN_CLUSTER=false
 export CORTEX_CLUSTER_CONFIG_PATH=~/.cortex/cluster-dev.yaml
 
-clear && echo "starting local operator..."
+clear
+mkdir -p ./bin
+
+if [ "$arg1" != "--operator-only" ]; then
+  echo "building cli..."
+  go build -o $ROOT/bin/cortex $ROOT/cli
+fi
 
-mkdir -p ./bin && go build -o $ROOT/bin/cortex $ROOT/cli && go build -o $ROOT/bin/operator $ROOT/pkg/operator && ($ROOT/bin/operator &)
+echo "building operator..."
+go build -o $ROOT/bin/operator $ROOT/pkg/operator
+
+echo "starting local operator..."
+($ROOT/bin/operator &)
 
 trap ctrl_c INT
 function ctrl_c() {
   kill $(pgrep -f /bin/operator) >/dev/null 2>&1
+  exit 1
 }
 
-watchmedo shell-command \
-  --command='kill $(pgrep -f /bin/operator);'" clear && echo 'restarting local operator...' && go build -o $ROOT/bin/cortex $ROOT/cli && go build -o $ROOT/bin/operator $ROOT/pkg/operator && $ROOT/bin/operator &" \
-  --patterns '*.go;*.yaml' \
-  --recursive \
-  --drop \
-  $ROOT/pkg $ROOT/cli $ROOT/dev/config
+if [ "$arg1" = "--operator-only" ]; then
+  watchmedo shell-command \
+    --command='kill $(pgrep -f /bin/operator);'" clear && echo 'rebuilding operator...' && go build -o $ROOT/bin/operator $ROOT/pkg/operator && echo 'starting local operator...' && $ROOT/bin/operator &" \
+    --patterns '*.go;*.yaml' \
+    --recursive \
+    --drop \
+    $ROOT/pkg $ROOT/dev/config
+else
+  watchmedo shell-command \
+    --command='kill $(pgrep -f /bin/operator);'" clear && echo 'rebuilding cli...' && go build -o $ROOT/bin/cortex $ROOT/cli && echo 'rebuilding operator...' && go build -o $ROOT/bin/operator $ROOT/pkg/operator && echo 'starting local operator...' && $ROOT/bin/operator &" \
+    --patterns '*.go;*.yaml' \
+    --recursive \
+    --drop \
+    $ROOT/cli $ROOT/pkg $ROOT/dev/config
+fi
 
 # go run -race $ROOT/pkg/operator/main.go  # Check for race conditions. Doesn't seem to catch them all?