Added golangci-lint

Depends-On: https://review.opendev.org/716452
Change-Id: Id691eeedd8727fe922015be5ac62b6cd23c59eca
This commit is contained in:
Mohammed Naser 2020-03-31 21:41:12 -04:00 committed by okozachenko
parent f97dbdcff0
commit 76e81ec692
4 changed files with 12 additions and 10 deletions

View File

@ -73,6 +73,7 @@
- project:
check:
jobs:
- golangci-lint
- openstack-operator:linters:chart
- openstack-operator:images:build
- openstack-operator:functional:
@ -80,6 +81,7 @@
- openstack-operator:images:build
gate:
jobs:
- golangci-lint
- openstack-operator:linters:chart
- openstack-operator:images:upload
- openstack-operator:functional:
@ -87,4 +89,4 @@
- openstack-operator:images:upload
promote:
jobs:
- openstack-operator:images:promote
- openstack-operator:images:promote

View File

@ -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

View File

@ -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 {

View File

@ -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 {