Skip to content

Commit

Permalink
my localdev changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ClifHouck committed Nov 12, 2024
1 parent ef4f6e0 commit f296307
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 6 deletions.
3 changes: 2 additions & 1 deletion client/python/examples/simple.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/binoculars/config.yaml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion config/lookoutv2/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tls:
postgres:
connection:
host: postgres
port: 5433
port: 5432
user: postgres
password: psw
dbname: lookout
Expand Down
12 changes: 11 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions magefiles/helm.go
Original file line number Diff line number Diff line change
@@ -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
}
1 change: 1 addition & 0 deletions magefiles/kind.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
}

Expand Down
6 changes: 5 additions & 1 deletion magefiles/kubectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit f296307

Please sign in to comment.