From 442ecb895dc4be514900fb6781c105fb12860e23 Mon Sep 17 00:00:00 2001 From: junot Date: Mon, 15 Sep 2025 10:20:13 +0800 Subject: [PATCH] fix port shadowing and reloader resources Signed-off-by: junot --- pkg/controllers/resources/gateway/service.go | 4 ++-- pkg/controllers/resources/ruler/statefulset.go | 12 ++---------- pkg/controllers/resources/storage/service.go | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/pkg/controllers/resources/gateway/service.go b/pkg/controllers/resources/gateway/service.go index 909b413d..5a4ffcc3 100644 --- a/pkg/controllers/resources/gateway/service.go +++ b/pkg/controllers/resources/gateway/service.go @@ -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 { diff --git a/pkg/controllers/resources/ruler/statefulset.go b/pkg/controllers/resources/ruler/statefulset.go index 3c5f4505..32d948b5 100644 --- a/pkg/controllers/resources/ruler/statefulset.go +++ b/pkg/controllers/resources/ruler/statefulset.go @@ -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), @@ -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) diff --git a/pkg/controllers/resources/storage/service.go b/pkg/controllers/resources/storage/service.go index ffb8724d..962337fb 100644 --- a/pkg/controllers/resources/storage/service.go +++ b/pkg/controllers/resources/storage/service.go @@ -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 {