diff --git a/controllers/capacity.go b/controllers/capacity.go index ec2aea2..cdd4319 100644 --- a/controllers/capacity.go +++ b/controllers/capacity.go @@ -10,13 +10,14 @@ import ( func MkZuulCapacityContainer() apiv1.Container { container := base.MkContainer("zuul-capacity", "ghcr.io/softwarefactory-project/zuul-capacity:latest") + container.Args = []string{"--port", "9100"} container.Env = []apiv1.EnvVar{ base.MkEnvVar("OS_CLIENT_CONFIG_FILE", "/.openstack/clouds.yaml"), } container.Ports = []apiv1.ContainerPort{ - base.MkContainerPort(8080, "zuul-capacity"), + base.MkContainerPort(9100, "zuul-capacity"), } - container.ReadinessProbe = base.MkReadinessHTTPProbe("/", 8080) + container.ReadinessProbe = base.MkReadinessHTTPProbe("/", 9100) container.VolumeMounts = []apiv1.VolumeMount{ { Name: "nodepool-config", diff --git a/controllers/nodepool.go b/controllers/nodepool.go index 2ed3512..a21de7d 100644 --- a/controllers/nodepool.go +++ b/controllers/nodepool.go @@ -795,7 +795,7 @@ func (r *SFController) DeployNodepoolLauncher(statsdExporterVolume apiv1.Volume, ) // Setup zuul-capacity service - zcSrv := base.MkService("zuul-capacity", r.ns, "nodepool-launcher", []int32{8080}, "zuul-capacity", r.cr.Spec.ExtraLabels) + zcSrv := base.MkService("zuul-capacity", r.ns, "nodepool-launcher", []int32{9100}, "zuul-capacity", r.cr.Spec.ExtraLabels) r.GetOrCreate(&zcSrv) } diff --git a/controllers/static/gateway/gateway.conf b/controllers/static/gateway/gateway.conf index 8c42838..6afe571 100644 --- a/controllers/static/gateway/gateway.conf +++ b/controllers/static/gateway/gateway.conf @@ -28,7 +28,7 @@ ProxyPassReverse /zuul http://zuul-web:9000/ # Handle zuul-capacity requests - ProxyPass "/zuul-capacity" "http://zuul-capacity:8080" retry=0 + ProxyPass "/zuul-capacity" "http://zuul-capacity:9100" retry=0 # Handle Weeder requests ProxyPass "/weeder" "http://zuul-weeder:9001" retry=0 diff --git a/doc/reference/CHANGELOG.md b/doc/reference/CHANGELOG.md index 9a61a55..ca3a727 100644 --- a/doc/reference/CHANGELOG.md +++ b/doc/reference/CHANGELOG.md @@ -10,6 +10,13 @@ All notable changes to this project will be documented in this file. ### Removed ### Fixed +## [v0.0.49] - 2024-12-03 + +### Changed + +- zuul-capacity default port is changed to 9100 + + ## [v0.0.48] - 2024-11-26 ### Added