From aed49ff54febab3cd025f91912a966ee98a33572 Mon Sep 17 00:00:00 2001 From: Arunprasad Rajkumar Date: Thu, 15 Jul 2021 18:12:25 +0530 Subject: [PATCH] fix: incorrect type used for openapi spec Prior to this fix, openapi spec for prometheus-adapter apiextension was based on the type "k8s.io/sample-apiserver/pkg/apiserver" which is incorrect. Due to the incorrect type, `kubectl explain podmetrics` (or nodemetrics) wasn't showing any doc for any resources from metrics.k8s.io/v1beta1. This changeset fixes the problem by using the right type(sigs.k8s.io/metrics-server/pkg/api) for the openapi generation. This also helped to remove the sample-apiserver dependency from prometheus-adapter. Signed-off-by: Arunprasad Rajkumar --- cmd/adapter/adapter.go | 3 +-- go.mod | 1 - go.sum | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go index 2f566cd4..dc44f5ca 100644 --- a/cmd/adapter/adapter.go +++ b/cmd/adapter/adapter.go @@ -41,7 +41,6 @@ import ( "k8s.io/client-go/transport" "k8s.io/component-base/logs" "k8s.io/klog/v2" - "k8s.io/sample-apiserver/pkg/apiserver" "sigs.k8s.io/metrics-server/pkg/api" @@ -275,7 +274,7 @@ func main() { } cmd.Name = "prometheus-metrics-adapter" - cmd.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(apiserver.Scheme)) + cmd.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(api.Scheme)) cmd.OpenAPIConfig.Info.Title = "prometheus-metrics-adapter" cmd.OpenAPIConfig.Info.Version = "1.0.0" diff --git a/go.mod b/go.mod index c51563a5..f9f4101e 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,5 @@ require ( k8s.io/klog/v2 v2.8.0 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 k8s.io/metrics v0.21.1 - k8s.io/sample-apiserver v0.21.1 sigs.k8s.io/metrics-server v0.5.0 ) diff --git a/go.sum b/go.sum index 0ab280bf..e4e3ccc1 100644 --- a/go.sum +++ b/go.sum @@ -495,7 +495,6 @@ github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -923,8 +922,6 @@ k8s.io/kubelet v0.21.1/go.mod h1:poOR6Iaa5WqytFOp0egXFV8c2XTLFxaXTdj5njUlnVY= k8s.io/metrics v0.20.0/go.mod h1:9yiRhfr8K8sjdj2EthQQE9WvpYDvsXIV3CjN4Ruq4Jw= k8s.io/metrics v0.21.1 h1:Xlfrjdda/WWHxG6/h6ACykxb1RByy5EIT862Vc81IYQ= k8s.io/metrics v0.21.1/go.mod h1:pyDVLsLe++FIGDBFU80NcW4xMFsuiVTWL8Zfi7+PpNo= -k8s.io/sample-apiserver v0.21.1 h1:udhsFyOxvSCOtqOZJq1BXXHI3+Y7zqrZ/CW9xc9s7BQ= -k8s.io/sample-apiserver v0.21.1/go.mod h1:haiFU1SSB0+EaaqTpg+CxqOLVwsmjBOJ/CeOk6BTabs= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=