Skip to content

Commit 062312b

Browse files
committed
Fix formatting
1 parent 52b4eaf commit 062312b

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

pkg/apiserver/emapis.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
genericapiserver "k8s.io/apiserver/pkg/server"
2727

2828
specificapi "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/apiserver/installer"
29+
"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"
2930
metricstorage "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/registry/external_metrics"
3031
"k8s.io/metrics/pkg/apis/external_metrics"
31-
"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"
3232
)
3333

3434
// InstallExternalMetricsAPI registers the api server in Kube Aggregator
@@ -86,6 +86,6 @@ func (s *CustomMetricsAdapterServer) emAPI(groupMeta *apimachinery.GroupMeta, gr
8686
OptionsExternalVersion: &schema.GroupVersion{Version: "v1"},
8787
},
8888
ResourceLister: provider.NewExternalMetricResourceLister(s.Provider),
89-
Handlers: &specificapi.EMHandlers{},
89+
Handlers: &specificapi.EMHandlers{},
9090
}
9191
}

pkg/apiserver/installer/cmhandlers.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ import (
3030
"github.com/emicklei/go-restful"
3131
)
3232

33-
type CMHandlers struct {
34-
}
33+
type CMHandlers struct{}
3534

3635
// registerResourceHandlers registers the resource handlers for custom metrics.
3736
// Compared to the normal installer, this plays fast and loose a bit, but should still

pkg/apiserver/installer/emhandlers.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ import (
3030
"github.com/emicklei/go-restful"
3131
)
3232

33-
type EMHandlers struct {
34-
}
33+
type EMHandlers struct{}
3534

3635
// registerResourceHandlers registers the resource handlers for external metrics.
3736
// The implementation is based on corresponding registerResourceHandlers for Custom Metrics API
@@ -129,7 +128,7 @@ func (ch *EMHandlers) registerResourceHandlers(a *MetricsAPIInstaller, ws *restf
129128
externalMetricRoute := ws.GET(externalMetricPath).To(externalMetricHandler).
130129
Doc(doc).
131130
Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")).
132-
Operation("list" + kind).
131+
Operation("list"+kind).
133132
Produces(allMediaTypes...).
134133
Returns(http.StatusOK, "OK", versionedList).
135134
Writes(versionedList)

pkg/apiserver/installer/installer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ type MetricsAPIInstaller struct {
103103
group *MetricsAPIGroupVersion
104104
prefix string // Path prefix where API resources are to be registered.
105105
minRequestTimeout time.Duration
106-
handlers Handlers
106+
handlers Handlers
107107

108108
// TODO: do we want to embed a normal API installer here so we can serve normal
109109
// endpoints side by side with dynamic ones (from the same API group)?

pkg/sample-cmd/provider/provider.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
)
3737

3838
type externalMetric struct {
39-
info provider.ExternalMetricInfo
39+
info provider.ExternalMetricInfo
4040
value external_metrics.ExternalMetricValue
4141
}
4242

@@ -78,9 +78,9 @@ var (
7878
Labels: map[string]string{},
7979
},
8080
value: external_metrics.ExternalMetricValue{
81-
MetricName: "other-external-metric",
81+
MetricName: "other-external-metric",
8282
MetricLabels: map[string]string{},
83-
Value: *resource.NewQuantity(44, resource.DecimalSI),
83+
Value: *resource.NewQuantity(44, resource.DecimalSI),
8484
},
8585
},
8686
}
@@ -90,15 +90,15 @@ type testingProvider struct {
9090
client dynamic.ClientPool
9191
mapper apimeta.RESTMapper
9292

93-
values map[provider.CustomMetricInfo]int64
93+
values map[provider.CustomMetricInfo]int64
9494
externalMetrics []externalMetric
9595
}
9696

9797
func NewFakeProvider(client dynamic.ClientPool, mapper apimeta.RESTMapper) provider.MetricsProvider {
9898
return &testingProvider{
99-
client: client,
100-
mapper: mapper,
101-
values: make(map[provider.CustomMetricInfo]int64),
99+
client: client,
100+
mapper: mapper,
101+
values: make(map[provider.CustomMetricInfo]int64),
102102
externalMetrics: testingMetrics,
103103
}
104104
}

0 commit comments

Comments
 (0)