Skip to content

Commit

Permalink
Drop custom OpenAPIConfig instead of the default one from custom-metr…
Browse files Browse the repository at this point in the history
…ics-apiserver

See gardener-attic#8 (comment)
  • Loading branch information
ialidzhikov committed Mar 27, 2024
1 parent 9b25d78 commit cd3375a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
9 changes: 0 additions & 9 deletions pkg/metrics_provider/metrics_provider_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@ import (

"github.com/go-logr/logr"
"github.com/spf13/pflag"
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
genericapiserver "k8s.io/apiserver/pkg/server"
customexternalmetrics "sigs.k8s.io/custom-metrics-apiserver/pkg/apiserver"
basecmd "sigs.k8s.io/custom-metrics-apiserver/pkg/cmd"

generatedopenapi "github.com/gardener/gardener-custom-metrics/pkg/api/generated/openapi"
"github.com/gardener/gardener-custom-metrics/pkg/app"
"github.com/gardener/gardener-custom-metrics/pkg/input/input_data_registry"
)
Expand Down Expand Up @@ -45,16 +41,11 @@ func NewMetricsProviderService() *MetricsProviderService {
result := &MetricsProviderService{
AdapterBase: basecmd.AdapterBase{
Name: adapterName,
OpenAPIConfig: genericapiserver.DefaultOpenAPIConfig(
generatedopenapi.GetOpenAPIDefinitions,
openapinamer.NewDefinitionNamer(customexternalmetrics.Scheme)),
},
maxSampleAge: 90 * time.Second,
maxSampleGap: 600 * time.Second,
testIsolation: metricsServiceTestIsolation{NewMetricsProvider: NewMetricsProvider},
}
result.OpenAPIConfig.Info.Title = adapterName
result.OpenAPIConfig.Info.Version = "1.0.0"

return result
}
Expand Down
1 change: 0 additions & 1 deletion pkg/metrics_provider/metrics_provider_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ var _ = Describe("MetricsService", func() {
Expect(actualMaxSampleAge).To(Equal(90 * time.Second))
Expect(actualMaxSampleGap).To(Equal(10 * time.Minute))
Expect(mps.Name).To(Equal(adapterName))
Expect(mps.OpenAPIConfig).NotTo(BeNil())
})
})
})

0 comments on commit cd3375a

Please sign in to comment.