Drop custom OpenAPIConfig instead of the default one from custom-metr…

…ics-apiserver

See #8 (comment)

Makefile

@@ -90,21 +90,10 @@ tidy:
 clean:
 	@$(REPO_ROOT)/third_party/gardener/gardener/hack/clean.sh ./cmd/... ./pkg/...
 
-.PHONY: check-generate
-check-generate:
-	echo "Code generation is currently not implemented"
-	# @$(REPO_ROOT)/third_party/gardener/gardener/hack/check-generate.sh $(REPO_ROOT)
-
 .PHONY: check
 check: $(GOIMPORTS) $(GOLANGCI_LINT) $(HELM)
 	@$(REPO_ROOT)/third_party/gardener/gardener/hack/check.sh --golangci-lint-config=./.golangci.yaml ./cmd/... ./pkg/...
 
-.PHONY: generate
-generate: $(CONTROLLER_GEN) $(GEN_CRD_API_REFERENCE_DOCS) $(HELM) $(YQ)
-	echo "Code generation is currently not implemented"
-	# @$(REPO_ROOT)/third_party/gardener/gardener/hack/generate.sh ./cmd/... ./pkg/...
-	# $(MAKE) format
-
 .PHONY: format
 format: $(GOIMPORTS) $(GOIMPORTSREVISER)
 	@$(REPO_ROOT)/third_party/gardener/gardener/hack/format.sh ./cmd ./pkg
@@ -125,7 +114,7 @@ test-clean:
 verify: check format test
 
 .PHONY: verify-extended
-verify-extended: check-generate check format test-cov test-clean
+verify-extended: check format test-cov test-clean
 
 # skaffold dev and debug clean up deployed modules by default, disable this
 debug: export SKAFFOLD_CLEANUP = false

pkg/metrics_provider/metrics_provider_service.go

@@ -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"
 )
@@ -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
 }

pkg/metrics_provider/metrics_provider_service_test.go

@@ -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())
 		})
 	})
 })