diff --git a/.zuul.yaml b/.zuul.yaml index 50cbcfc2..0bb95eba 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -49,6 +49,7 @@ - project: check: jobs: + - golangci-lint - openstack-operator:linters:chart - openstack-operator:images:build - openstack-operator:functional: @@ -56,6 +57,7 @@ - openstack-operator:images:build gate: jobs: + - golangci-lint - openstack-operator:linters:chart - openstack-operator:images:upload - openstack-operator:functional: diff --git a/builders/pod_metrics_endpoint.go b/builders/pod_metrics_endpoint.go index 5e1426fb..df631f6a 100755 --- a/builders/pod_metrics_endpoint.go +++ b/builders/pod_metrics_endpoint.go @@ -1,7 +1,6 @@ package builders import ( - "k8s.io/apimachinery/pkg/util/intstr" monitoringv1 "opendev.org/vexxhost/openstack-operator/api/monitoring/v1" ) @@ -23,18 +22,16 @@ func (pme *PodMetricsEndpointBuilder) Port(port string) *PodMetricsEndpointBuild return pme } -func (pme *PodMetricsEndpointBuilder) TargetPort(targetPort intstr.IntOrString) *PodMetricsEndpointBuilder { - pme.obj.TargetPort = &targetPort - return pme -} func (pme *PodMetricsEndpointBuilder) Path(path string) *PodMetricsEndpointBuilder { pme.obj.Path = path return pme } + func (pme *PodMetricsEndpointBuilder) Scheme(scheme string) *PodMetricsEndpointBuilder { pme.obj.Scheme = scheme return pme } + func (pme *PodMetricsEndpointBuilder) Params(params map[string][]string) *PodMetricsEndpointBuilder { pme.obj.Params = params return pme @@ -44,14 +41,17 @@ func (pme *PodMetricsEndpointBuilder) Interval(interval string) *PodMetricsEndpo pme.obj.Interval = interval return pme } + func (pme *PodMetricsEndpointBuilder) ScrapeTimeout(scrapeTimeout string) *PodMetricsEndpointBuilder { pme.obj.ScrapeTimeout = scrapeTimeout return pme } + func (pme *PodMetricsEndpointBuilder) HonorLabels(honorLabels bool) *PodMetricsEndpointBuilder { pme.obj.HonorLabels = honorLabels return pme } + func (pme *PodMetricsEndpointBuilder) HonorTimestamps(honorTimestamps bool) *PodMetricsEndpointBuilder { pme.obj.HonorTimestamps = &honorTimestamps return pme diff --git a/controllers/mcrouter_controller.go b/controllers/mcrouter_controller.go index 7eacb0bd..ab5892b8 100755 --- a/controllers/mcrouter_controller.go +++ b/controllers/mcrouter_controller.go @@ -130,7 +130,7 @@ func (r *McrouterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { }, ObjectMeta: metav1.ObjectMeta{ Namespace: req.Namespace, - Name: fmt.Sprintf("mcrouter-podmonitor"), + Name: "mcrouter-podmonitor", Labels: map[string]string{ "app.kubernetes.io/name": "mcrouter", "app.kubernetes.io/managed-by": "openstack-operator", @@ -160,7 +160,7 @@ func (r *McrouterReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { alertRule := &monitoringv1.PrometheusRule{ ObjectMeta: metav1.ObjectMeta{ Namespace: req.Namespace, - Name: fmt.Sprintf("mcrouter-alertrule"), + Name: "mcrouter-alertrule", }, } op, err = utils.CreateOrUpdate(ctx, r, alertRule, func() error { diff --git a/controllers/memcached_controller.go b/controllers/memcached_controller.go index 0f908023..9d34b448 100755 --- a/controllers/memcached_controller.go +++ b/controllers/memcached_controller.go @@ -127,7 +127,7 @@ func (r *MemcachedReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { }, ObjectMeta: metav1.ObjectMeta{ Namespace: req.Namespace, - Name: fmt.Sprintf("memcached-podmonitor"), + Name: "memcached-podmonitor", Labels: map[string]string{ "app.kubernetes.io/name": "memcached", "app.kubernetes.io/managed-by": "openstack-operator", @@ -181,7 +181,7 @@ func (r *MemcachedReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) { alertRule := &monitoringv1.PrometheusRule{ ObjectMeta: metav1.ObjectMeta{ Namespace: req.Namespace, - Name: fmt.Sprintf("memcached-alertrule"), + Name: "memcached-alertrule", }, } op, err = utils.CreateOrUpdate(ctx, r, alertRule, func() error {