Skip to content

fix port shadowing and reloader resources #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frezes merged 1 commit into from
Sep 15, 2025
Merged

fix port shadowing and reloader resources #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/controllers/resources/gateway/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ func (g *Gateway) service() (runtime.Object, resources.Operation, error) {
}

replaced := util.ReplaceInSlice(s.Spec.Ports, func(v interface{}) bool {
port := v.(corev1.ServicePort)
return port.Name == port.Name
p := v.(corev1.ServicePort)
return p.Name == port.Name
}, port)

if !replaced {
Expand Down
12 changes: 2 additions & 10 deletions pkg/controllers/resources/ruler/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,18 +598,8 @@ func (r *Ruler) statefulSet(shardSn int) (runtime.Object, resources.Operation, e

sort.Strings(container.Args[1:])

defautReloaderConfig := promoperator.DefaultConfig(r.ruler.Spec.PrometheusConfigReloader.Resources.Limits.Cpu().String(), r.ruler.Spec.PrometheusConfigReloader.Resources.Limits.Memory().String())
var reloaderConfig = promoperator.ContainerConfig{
Image: r.ruler.Spec.PrometheusConfigReloader.Image,
CPURequests: defautReloaderConfig.ReloaderConfig.CPURequests,
MemoryRequests: defautReloaderConfig.ReloaderConfig.MemoryRequests,
CPULimits: defautReloaderConfig.ReloaderConfig.CPULimits,
MemoryLimits: defautReloaderConfig.ReloaderConfig.MemoryLimits,
}

var reloadContainer = promoperator.CreateConfigReloader(
"config-reloader",
promoperator.ReloaderConfig(reloaderConfig),
promoperator.ReloaderURL(url.URL{
Scheme: "http",
Host: fmt.Sprintf("127.0.0.1:%d", constants.HTTPPort),
Expand All @@ -623,6 +613,8 @@ func (r *Ruler) statefulSet(shardSn int) (runtime.Object, resources.Operation, e
promoperator.VolumeMounts(configReloaderVolumeMounts),
promoperator.Shard(-1),
)
reloadContainer.Image = r.ruler.Spec.PrometheusConfigReloader.Image
reloadContainer.Resources = r.ruler.Spec.PrometheusConfigReloader.Resources

sts.Spec.Template.Spec.Containers = append(sts.Spec.Template.Spec.Containers, container, reloadContainer)

Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/resources/storage/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ func (s *Storage) service() (runtime.Object, resources.Operation, error) {
}

replaced := util.ReplaceInSlice(svc.Spec.Ports, func(v interface{}) bool {
port := v.(corev1.ServicePort)
return port.Name == port.Name
p := v.(corev1.ServicePort)
return p.Name == port.Name
}, port)

if !replaced {
Expand Down
Loading