Remove build/verify scripts for swagger 1.2 API docs, API server swag…

…ger ui / swagger 1.2 config
pacoxu · Jan 15, 2019 · 9229399 · 9229399
1 parent c3871e6
commit 9229399
Show file tree

Hide file tree

Showing 42 changed files with 16 additions and 47,644 deletions.
diff --git a/.generated_files b/.generated_files
@@ -24,7 +24,6 @@ file-name	types_swagger_doc_generated.go
 
 path-prefix	Godeps/
 path-prefix	vendor/
-path-prefix	api/swagger-spec/
 path-prefix	pkg/generated/
 
 paths-from-repo	docs/.generated_docs
diff --git a/.gitattributes b/.gitattributes
@@ -6,6 +6,4 @@ test/test_owners.csv merge=union
 **/generated.pb.go linguist-generated=true
 **/generated.proto
 **/types_swagger_doc_generated.go linguist-generated=true
-docs/api-reference/** linguist-generated=true
-api/swagger-spec/*.json linguist-generated=true
 api/openapi-spec/*.json linguist-generated=true
diff --git a/cmd/kube-apiserver/app/aggregator.go b/cmd/kube-apiserver/app/aggregator.go
@@ -73,10 +73,6 @@ func createAggregatorConfig(
 		aggregatorscheme.Scheme,
 		pluginInitializers...)
 
-	// the aggregator doesn't wire these up.  It just delegates them to the kubeapiserver
-	genericConfig.EnableSwaggerUI = false
-	genericConfig.SwaggerConfig = nil
-
 	// copy the etcd options so we don't mutate originals.
 	etcdOptions := *commandOptions.Etcd
 	etcdOptions.StorageConfig.Paging = utilfeature.DefaultFeatureGate.Enabled(features.APIListChunking)

diff --git a/cmd/kube-apiserver/app/options/options_test.go b/cmd/kube-apiserver/app/options/options_test.go
@@ -96,7 +96,6 @@ func TestAddFlags(t *testing.T) {
 		"--contention-profiling=true",
 		"--enable-aggregator-routing=true",
 		"--enable-logs-handler=false",
-		"--enable-swagger-ui=true",
 		"--endpoint-reconciler-type=" + string(reconcilers.LeaseEndpointReconcilerType),
 		"--etcd-keyfile=/var/run/kubernetes/etcd.key",
 		"--etcd-certfile=/var/run/kubernetes/etcdce.crt",
@@ -245,7 +244,6 @@ func TestAddFlags(t *testing.T) {
 			PolicyFile: "/policy",
 		},
 		Features: &apiserveroptions.FeatureOptions{
-			EnableSwaggerUI:           true,
 			EnableProfiling:           true,
 			EnableContentionProfiling: true,
 		},

diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
@@ -405,7 +405,6 @@ func buildGenericConfig(
 	genericConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(generatedopenapi.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(legacyscheme.Scheme, extensionsapiserver.Scheme, aggregatorscheme.Scheme))
 	genericConfig.OpenAPIConfig.PostProcessSpec = postProcessOpenAPISpecForBackwardCompatibility
 	genericConfig.OpenAPIConfig.Info.Title = "Kubernetes"
-	genericConfig.SwaggerConfig = genericapiserver.DefaultSwaggerConfig()
 	genericConfig.LongRunningFunc = filters.BasicLongRunningRequestCheck(
 		sets.NewString("watch", "proxy"),
 		sets.NewString("attach", "exec", "proxy", "log", "portforward"),

diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -568,7 +568,6 @@ staging/src/k8s.io/apiserver/pkg/server
 staging/src/k8s.io/apiserver/pkg/server/healthz
 staging/src/k8s.io/apiserver/pkg/server/httplog
 staging/src/k8s.io/apiserver/pkg/server/options
-staging/src/k8s.io/apiserver/pkg/server/routes/data/swagger
 staging/src/k8s.io/apiserver/pkg/server/storage
 staging/src/k8s.io/apiserver/pkg/storage
 staging/src/k8s.io/apiserver/pkg/storage/errors

diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
@@ -69,7 +69,6 @@
 ./hack/benchmark-go.sh
 ./hack/build-cross.sh
 ./hack/build-go.sh
-./hack/build-ui.sh
 ./hack/cherry_pick_pull.sh
 ./hack/dev-build-and-push.sh
 ./hack/dev-build-and-up.sh
@@ -125,7 +124,6 @@
 ./hack/test-integration.sh
 ./hack/test-update-storage-objects.sh
 ./hack/update-all.sh
-./hack/update-api-reference-docs.sh
 ./hack/update-bazel.sh
 ./hack/update-codegen.sh
 ./hack/update-generated-device-plugin-dockerized.sh
@@ -147,12 +145,10 @@
 ./hack/update-openapi-spec.sh
 ./hack/update-staging-godeps-dockerized.sh
 ./hack/update-staging-godeps.sh
-./hack/update-swagger-spec.sh
 ./hack/update-translations.sh
 ./hack/update-workspace-mirror.sh
 ./hack/verify-all.sh
 ./hack/verify-api-groups.sh
-./hack/verify-api-reference-docs.sh
 ./hack/verify-bazel.sh
 ./hack/verify-boilerplate.sh
 ./hack/verify-cli-conventions.sh
@@ -183,7 +179,6 @@
 ./hack/verify-spelling.sh
 ./hack/verify-staging-godeps.sh
 ./hack/verify-staging-meta-files.sh
-./hack/verify-swagger-spec.sh
 ./hack/verify-symbols.sh
 ./hack/verify-test-featuregates.sh
 ./hack/verify-test-images.sh

diff --git a/hack/.spelling_failures b/hack/.spelling_failures
@@ -3,7 +3,6 @@ CHANGELOG
 OWNERS
 api.pb.go
 api.proto
-docs/api-reference
 docs/man
 docs/user-guide
 generated.pb.go

diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py
@@ -152,8 +152,7 @@ def file_extension(filename):
                 "pkg/kubectl/generated/bindata.go"]
 
 # list all the files contain 'DO NOT EDIT', but are not generated
-skipped_ungenerated_files = ['hack/build-ui.sh', 'hack/lib/swagger.sh',
-                             'hack/boilerplate/boilerplate.py']
+skipped_ungenerated_files = ['hack/lib/swagger.sh', 'hack/boilerplate/boilerplate.py']
 
 def normalize_files(files):
     newfiles = []

diff --git a/hack/build-ui.sh b/hack/build-ui.sh
diff --git a/hack/gen-swagger-doc/Dockerfile b/hack/gen-swagger-doc/Dockerfile
diff --git a/hack/gen-swagger-doc/README.md b/hack/gen-swagger-doc/README.md
diff --git a/hack/gen-swagger-doc/build.gradle b/hack/gen-swagger-doc/build.gradle