diff --git a/build/docker-compose.yml b/build/docker-compose.yml index f6e9887..836f791 100644 --- a/build/docker-compose.yml +++ b/build/docker-compose.yml @@ -10,10 +10,10 @@ services: - rabbitmq - redis ports: - - "9000:80" + - "9000:9000" - "8080:8080" environment: - - LB_ADDRS=lb:80 + - LB_ADDRS=lb:9000 - SERVICE_NAME=codebox-broker - TRACING_SAMPLING=1 @@ -24,7 +24,7 @@ services: depends_on: - redis ports: - - "9001:80" + - "9001:9000" environment: - SERVICE_NAME=codebox-lb diff --git a/cmd/broker.go b/cmd/broker.go index 77fdf0b..bb15cc4 100644 --- a/cmd/broker.go +++ b/cmd/broker.go @@ -38,7 +38,7 @@ As there is no authentication, always run it in a private network.`, Flags: []cli.Flag{ &cli.IntFlag{ Name: "port", Aliases: []string{"p"}, Usage: "port for grpc server", - EnvVars: []string{"PORT"}, Value: 8000, + EnvVars: []string{"PORT"}, Value: 9000, }, &cli.IntFlag{ Name: "uwsgi-port", Usage: "port for uwsgi server", @@ -58,7 +58,7 @@ As there is no authentication, always run it in a private network.`, // Broker Server options. &cli.StringSliceFlag{ Name: "lb-addrs", Usage: "load balancer TCP addresses", - EnvVars: []string{"LB_ADDRS"}, Value: cli.NewStringSlice("127.0.0.1:8000"), + EnvVars: []string{"LB_ADDRS"}, Value: cli.NewStringSlice("127.0.0.1:9000"), }, &cli.IntFlag{ Name: "lb-retry", Usage: "number of retries on failed lb run", diff --git a/cmd/lb.go b/cmd/lb.go index 62bb7e4..cf9c60f 100644 --- a/cmd/lb.go +++ b/cmd/lb.go @@ -38,7 +38,7 @@ As there is no authentication, always run it in a private network.`, Flags: []cli.Flag{ &cli.IntFlag{ Name: "port", Aliases: []string{"p"}, Usage: "port for grpc server", - EnvVars: []string{"PORT"}, Value: 8000, + EnvVars: []string{"PORT"}, Value: 9000, }, // File Repo options. diff --git a/cmd/worker.go b/cmd/worker.go index 35b0218..1f8b971 100644 --- a/cmd/worker.go +++ b/cmd/worker.go @@ -175,7 +175,7 @@ var workerCmd = &cli.Command{ }, &cli.StringFlag{ Name: "lb-addr", Aliases: []string{"lb"}, Usage: "load balancer TCP address", - EnvVars: []string{"LB_ADDR"}, Value: "127.0.0.1:8000", + EnvVars: []string{"LB_ADDR"}, Value: "127.0.0.1:9000", }, // User Cache options. diff --git a/deploy.sh b/deploy.sh index 23837c7..fa12edb 100755 --- a/deploy.sh +++ b/deploy.sh @@ -41,7 +41,7 @@ envsubst() { deploy_broker() { # Deploy broker. - LB_ADDRS=$(seq -s, -f "codebox-lb-%02g.default:80" 1 $LB_TOTAL_NUM) + LB_ADDRS=$(seq -s, -f "codebox-lb-%02g.default:9000" 1 $LB_TOTAL_NUM) export LB_ADDRS=${LB_ADDRS%,} REPLICAS=$(kubectl get deployment/codebox-broker -o jsonpath='{.spec.replicas}' 2>/dev/null || echo "${BROKER_MIN}") export REPLICAS @@ -149,7 +149,7 @@ for (( LB_NUM=1; LB_NUM <= LB_TOTAL_NUM; LB_NUM++ )); do # Deploy workers. - LB_ADDR=codebox-lb-internal-${LB_NUM}.default:8000 + LB_ADDR=codebox-lb-internal-${LB_NUM}.default:9000 export LB_ADDR REPLICAS=$(kubectl get deployment/codebox-worker-"${LB_NUM}" -o jsonpath='{.spec.replicas}' 2>/dev/null || echo "${SCALING_MIN}") export REPLICAS diff --git a/deploy/yaml/broker-deployment.yml.j2 b/deploy/yaml/broker-deployment.yml.j2 index 1544a59..05a642a 100644 --- a/deploy/yaml/broker-deployment.yml.j2 +++ b/deploy/yaml/broker-deployment.yml.j2 @@ -43,7 +43,7 @@ spec: cpu: 250m ports: - name: grpc - containerPort: 8000 + containerPort: 9000 - name: uwsgi containerPort: 8080 - name: http-metrics diff --git a/deploy/yaml/broker-service.yml.j2 b/deploy/yaml/broker-service.yml.j2 index 18babd2..6a9cf1f 100644 --- a/deploy/yaml/broker-service.yml.j2 +++ b/deploy/yaml/broker-service.yml.j2 @@ -16,7 +16,7 @@ spec: targetPort: uwsgi - name: grpc protocol: TCP - port: 80 + port: 9000 targetPort: grpc - name: http-metrics protocol: TCP diff --git a/deploy/yaml/lb-deployment.yml.j2 b/deploy/yaml/lb-deployment.yml.j2 index 00f1191..d85d9ce 100644 --- a/deploy/yaml/lb-deployment.yml.j2 +++ b/deploy/yaml/lb-deployment.yml.j2 @@ -46,7 +46,7 @@ spec: cpu: 1000m ports: - name: grpc - containerPort: 8000 + containerPort: 9000 - name: http-metrics containerPort: 9080 env: diff --git a/deploy/yaml/lb-service.yml.j2 b/deploy/yaml/lb-service.yml.j2 index 91878e6..97eae35 100644 --- a/deploy/yaml/lb-service.yml.j2 +++ b/deploy/yaml/lb-service.yml.j2 @@ -9,7 +9,7 @@ spec: ports: - name: grpc protocol: TCP - port: 80 + port: 9000 targetPort: grpc - name: http-metrics protocol: TCP