From f296307d298941e0f23d5d9b13656786c7253c12 Mon Sep 17 00:00:00 2001
From: Clif Houck <me@clifhouck.com>
Date: Wed, 25 Sep 2024 09:22:07 -0500
Subject: [PATCH] my localdev changes

---
 client/python/examples/simple.py |  3 ++-
 config/binoculars/config.yaml    |  4 ++--
 config/lookoutv2/config.yaml     |  2 +-
 docker-compose.yaml              | 12 +++++++++++-
 magefiles/helm.go                | 19 +++++++++++++++++++
 magefiles/kind.go                |  1 +
 magefiles/kubectl.go             |  6 +++++-
 7 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 magefiles/helm.go

diff --git a/client/python/examples/simple.py b/client/python/examples/simple.py
index 248bc467f2b..bceaeb7a8dd 100644
--- a/client/python/examples/simple.py
+++ b/client/python/examples/simple.py
@@ -54,7 +54,8 @@ def simple_workflow():
     """
 
     # The queue and job_set_id that will be used for all jobs
-    queue = f"simple-queue-{uuid.uuid1()}"
+    # queue = f"simple-queue-{uuid.uuid1()}"
+    queue = "simple-test"
     job_set_id = f"simple-jobset-{uuid.uuid1()}"
 
     # Ensures that the correct channel type is generated
diff --git a/config/binoculars/config.yaml b/config/binoculars/config.yaml
index 3ff5a6bd915..3f5b414728c 100644
--- a/config/binoculars/config.yaml
+++ b/config/binoculars/config.yaml
@@ -1,9 +1,9 @@
 grpcPort: 50051
-httpPort: 8080
+httpPort: 8082
 metricsPort: 9000
 corsAllowedOrigins:
   - http://localhost:3000
-  - http://localhost:8080
+  - http://localhost:8082
 cordon:
   additionalLabels:
     armadaproject.io/cordon-reason: "binoculars"
diff --git a/config/lookoutv2/config.yaml b/config/lookoutv2/config.yaml
index 78432997326..2d9e5d31a9e 100644
--- a/config/lookoutv2/config.yaml
+++ b/config/lookoutv2/config.yaml
@@ -11,7 +11,7 @@ tls:
 postgres:
   connection:
     host: postgres
-    port: 5433
+    port: 5432
     user: postgres
     password: psw
     dbname: lookout
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 748da9306d3..f79cffeb84f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -30,6 +30,12 @@ services:
       - ./developer/dependencies/postgres-init.sh:/docker-entrypoint-initdb.d/init-database.sh
     networks:
       - kind
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready", "-d", "scheduler"]
+      interval: 10s
+      timeout: 60s
+      retries: 5
+      start_period: 80s
 
   pulsar:
     image: ${PULSAR_IMAGE:-apachepulsar/pulsar:3.0.2}
@@ -142,8 +148,9 @@ services:
     networks:
       - kind
     ports:
-      - 8082:8080
+      - 8082:8082
       - 4002:4000
+      - 50053:50051
     volumes:
       - "./.kube/internal:/.kube"
       - "go-cache:/root/.cache/go-build:rw"
@@ -212,6 +219,9 @@ services:
       - "gomod-cache:/go/pkg/mod:rw"
     networks:
       - kind
+    depends_on:
+      lookoutv2-migration:
+        condition: service_started
     env_file:
       - ./developer/env/docker/lookoutv2.env
     working_dir: /app
diff --git a/magefiles/helm.go b/magefiles/helm.go
new file mode 100644
index 00000000000..b97010f19d9
--- /dev/null
+++ b/magefiles/helm.go
@@ -0,0 +1,19 @@
+package main
+
+import semver "github.com/Masterminds/semver/v3"
+
+func helmBinary() string {
+	return binaryWithExt("helm")
+}
+
+func helmRun(args ...string) error {
+	return nil
+}
+
+func helmVersion() (*semver.Version, error) {
+	return &semver.Version{}, nil
+}
+
+func helmCheck() error {
+	return nil
+}
diff --git a/magefiles/kind.go b/magefiles/kind.go
index 362b834c64a..56101dd5843 100644
--- a/magefiles/kind.go
+++ b/magefiles/kind.go
@@ -26,6 +26,7 @@ func getImagesUsedInTestsOrControllers() []string {
 		"nginx:1.27.0", // Used by ingress-controller
 		"alpine:3.20.0",
 		"bitnami/kubectl:1.30",
+		"docker.io/library/python:3.12",
 	}
 }
 
diff --git a/magefiles/kubectl.go b/magefiles/kubectl.go
index a2c1e426e1f..97f0f15ee83 100644
--- a/magefiles/kubectl.go
+++ b/magefiles/kubectl.go
@@ -19,7 +19,11 @@ func kubectlOutput(args ...string) (string, error) {
 }
 
 func kubectlRun(args ...string) error {
-	return sh.Run(kubectlBinary(), args...)
+	fullArgs := []string{"--insecure-skip-tls-verify"}
+	for _, arg := range args {
+		fullArgs = append(fullArgs, arg)
+	}
+	return sh.Run(kubectlBinary(), fullArgs...)
 }
 
 func kubectlVersion() (*semver.Version, error) {