Skip to content

Commit cfbcf43

Browse files
authored
Revert "feat(platform): proxy cluster version api (#1142)" (#1548)
This reverts commit ea282b5.
1 parent f6d756f commit cfbcf43

File tree

4 files changed

+10
-77
lines changed

4 files changed

+10
-77
lines changed

pkg/apiserver/filter/authentication.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ var (
7575
"/metrics",
7676
"/debug",
7777
"/openapi",
78+
"/version",
7879
"/swagger",
7980
"/favicon.ico",
8081
"/healthz",

pkg/apiserver/openapi/openapi.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"strings"
2626

2727
"github.com/go-openapi/spec"
28+
"k8s.io/apimachinery/pkg/version"
2829
openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
2930
genericapiserver "k8s.io/apiserver/pkg/server"
3031
openapicommon "k8s.io/kube-openapi/pkg/common"
@@ -43,6 +44,14 @@ func SetupOpenAPI(genericAPIServerConfig *genericapiserver.Config, getDefinition
4344
genericAPIServerConfig.OpenAPIConfig.Info.Version = appVersion.GitVersion
4445
genericAPIServerConfig.OpenAPIConfig.PostProcessSpec = postProcessOpenAPISpec(host, port)
4546

47+
// version
48+
genericAPIServerConfig.Version = &version.Info{
49+
GitVersion: appVersion.GitVersion,
50+
BuildDate: appVersion.BuildDate,
51+
GoVersion: appVersion.GoVersion,
52+
Compiler: appVersion.Compiler,
53+
Platform: appVersion.Platform,
54+
}
4655
}
4756

4857
func postProcessOpenAPISpec(host string, port int) func(*spec.Swagger) (*spec.Swagger, error) {

pkg/platform/apiserver/apiserver.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ import (
7171
schedulingrest "tkestack.io/tke/pkg/platform/proxy/scheduling/rest"
7272
settingsrest "tkestack.io/tke/pkg/platform/proxy/settings/rest"
7373
storagerest "tkestack.io/tke/pkg/platform/proxy/storage/rest"
74-
versionrest "tkestack.io/tke/pkg/platform/proxy/version/rest"
7574
platformrest "tkestack.io/tke/pkg/platform/registry/rest"
7675
"tkestack.io/tke/pkg/util/log"
7776
)
@@ -204,10 +203,6 @@ func (m *APIServer) InstallAPIs(apiResourceConfigSource serverstorage.APIResourc
204203
apiGroupsInfo = append(apiGroupsInfo, apiGroupInfo)
205204
}
206205

207-
// install /version route
208-
versionHandler := versionrest.NewVersionProxyHandler(m.GenericAPIServer.LoopbackClientConfig)
209-
versionHandler.Install(m.GenericAPIServer.Handler.GoRestfulContainer)
210-
211206
for i := range apiGroupsInfo {
212207
if err := m.GenericAPIServer.InstallAPIGroup(&apiGroupsInfo[i]); err != nil {
213208
log.Fatalf("Error in registering group versions: %v", err)

pkg/platform/proxy/version/rest/rest.go

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)