Move the StorageVersions types to kube-apiserver

build/kazel_generated.bzl

@@ -40,6 +40,7 @@ tags_values_pkgs = {"openapi-gen": {
         "pkg/apis/abac/v1beta1",
         "staging/src/k8s.io/api/admissionregistration/v1",
         "staging/src/k8s.io/api/admissionregistration/v1beta1",
+        "staging/src/k8s.io/api/apiserverinternal/v1alpha1",
         "staging/src/k8s.io/api/apps/v1",
         "staging/src/k8s.io/api/apps/v1beta1",
         "staging/src/k8s.io/api/apps/v1beta2",
@@ -88,7 +89,6 @@ tags_values_pkgs = {"openapi-gen": {
         "staging/src/k8s.io/apimachinery/pkg/runtime",
         "staging/src/k8s.io/apimachinery/pkg/util/intstr",
         "staging/src/k8s.io/apimachinery/pkg/version",
-        "staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1",
         "staging/src/k8s.io/apiserver/pkg/apis/audit/v1",
         "staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1",
         "staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1",
@@ -121,6 +121,7 @@ tags_pkgs_values = {"openapi-gen": {
     "staging/src/k8s.io/api/admission/v1beta1": ["false"],
     "staging/src/k8s.io/api/admissionregistration/v1": ["true"],
     "staging/src/k8s.io/api/admissionregistration/v1beta1": ["true"],
+    "staging/src/k8s.io/api/apiserverinternal/v1alpha1": ["true"],
     "staging/src/k8s.io/api/apps/v1": ["true"],
     "staging/src/k8s.io/api/apps/v1beta1": ["true"],
     "staging/src/k8s.io/api/apps/v1beta2": ["true"],
@@ -173,7 +174,6 @@ tags_pkgs_values = {"openapi-gen": {
     "staging/src/k8s.io/apimachinery/pkg/runtime": ["true"],
     "staging/src/k8s.io/apimachinery/pkg/util/intstr": ["true"],
     "staging/src/k8s.io/apimachinery/pkg/version": ["true"],
-    "staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1": ["true"],
     "staging/src/k8s.io/apiserver/pkg/apis/audit/v1": ["true"],
     "staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1": ["true"],
     "staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1": ["true"],

hack/.golint_failures

@@ -8,6 +8,7 @@ pkg/apis/abac/v1beta1
 pkg/apis/admission
 pkg/apis/admissionregistration/v1
 pkg/apis/admissionregistration/v1beta1
+pkg/apis/apiserverinternal
 pkg/apis/apps/v1
 pkg/apis/apps/v1beta1
 pkg/apis/apps/v1beta2
@@ -204,6 +205,7 @@ staging/src/k8s.io/api/admission/v1
 staging/src/k8s.io/api/admission/v1beta1
 staging/src/k8s.io/api/admissionregistration/v1
 staging/src/k8s.io/api/admissionregistration/v1beta1
+staging/src/k8s.io/api/apiserverinternal/v1alpha1
 staging/src/k8s.io/api/apps/v1
 staging/src/k8s.io/api/apps/v1beta1
 staging/src/k8s.io/api/apps/v1beta2
@@ -302,8 +304,6 @@ staging/src/k8s.io/apiserver/pkg/apis/apiserver
 staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1
 staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1
 staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1beta1
-staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal
-staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1
 staging/src/k8s.io/apiserver/pkg/apis/audit
 staging/src/k8s.io/apiserver/pkg/apis/audit/v1
 staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1

hack/lib/init.sh

@@ -106,6 +106,7 @@ storage.k8s.io/v1beta1 \
 storage.k8s.io/v1 \
 storage.k8s.io/v1alpha1 \
 flowcontrol.apiserver.k8s.io/v1alpha1 \
+internal.apiserver.k8s.io/v1alpha1 \
 }"
 
 # not all group versions are exposed by the server.  This list contains those

hack/lib/util.sh

@@ -329,6 +329,9 @@ kube::util::group-version-to-pkg-path() {
     meta/v1beta1)
       echo "vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1"
       ;;
+    internal.apiserver.k8s.io/v1alpha1)
+      echo "vendor/k8s.io/api/apiserverinternal/v1alpha1"
+      ;;
     *.k8s.io)
       echo "pkg/apis/${group_version%.*k8s.io}"
       ;;

pkg/BUILD

@@ -26,6 +26,7 @@ filegroup(
         "//pkg/apis/abac:all-srcs",
         "//pkg/apis/admission:all-srcs",
         "//pkg/apis/admissionregistration:all-srcs",
+        "//pkg/apis/apiserverinternal:all-srcs",
         "//pkg/apis/apps:all-srcs",
         "//pkg/apis/authentication:all-srcs",
         "//pkg/apis/authorization:all-srcs",

staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/BUILD → pkg/apis/apiserverinternal/BUILD

@@ -1,9 +1,4 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
@@ -13,8 +8,8 @@ go_library(
         "types.go",
         "zz_generated.deepcopy.go",
     ],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/apiserverinternal",
-    importpath = "k8s.io/apiserver/pkg/apis/apiserverinternal",
+    importpath = "k8s.io/kubernetes/pkg/apis/apiserverinternal",
+    visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
@@ -33,10 +28,11 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/fuzzer:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/install:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/validation:all-srcs",
+        "//pkg/apis/apiserverinternal/fuzzer:all-srcs",
+        "//pkg/apis/apiserverinternal/install:all-srcs",
+        "//pkg/apis/apiserverinternal/v1alpha1:all-srcs",
+        "//pkg/apis/apiserverinternal/validation:all-srcs",
     ],
     tags = ["automanaged"],
+    visibility = ["//visibility:public"],
 )

staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/doc.go → pkg/apis/apiserverinternal/doc.go

@@ -19,4 +19,4 @@ limitations under the License.
 
 // Package apiserverinternal contains the "internal" version of the API used by
 // the apiservers themselves.
-package apiserverinternal // import "k8s.io/apiserver/pkg/apis/apiserverinternal"
+package apiserverinternal // import "k8s.io/kubernetes/pkg/apis/apiserverinternal"

staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/fuzzer/BUILD → pkg/apis/apiserverinternal/fuzzer/BUILD

@@ -3,8 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["fuzzer.go"],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/apiserverinternal/fuzzer",
-    importpath = "k8s.io/apiserver/pkg/apis/apiserverinternal/fuzzer",
+    importpath = "k8s.io/kubernetes/pkg/apis/apiserverinternal/fuzzer",
     visibility = ["//visibility:public"],
     deps = ["//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library"],
 )

staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/install/BUILD → pkg/apis/apiserverinternal/install/BUILD

@@ -1,21 +1,25 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
     srcs = ["install.go"],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/apiserverinternal/install",
-    importpath = "k8s.io/apiserver/pkg/apis/apiserverinternal/install",
+    importpath = "k8s.io/kubernetes/pkg/apis/apiserverinternal/install",
+    visibility = ["//visibility:public"],
     deps = [
+        "//pkg/apis/apiserverinternal:go_default_library",
+        "//pkg/apis/apiserverinternal/v1alpha1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1:go_default_library",
+    ],
+)
+
+go_test(
+    name = "go_default_test",
+    srcs = ["roundtrip_test.go"],
+    embed = [":go_default_library"],
+    deps = [
+        "//pkg/apis/apiserverinternal/fuzzer:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library",
     ],
 )
 
@@ -30,14 +34,5 @@ filegroup(
     name = "all-srcs",
     srcs = [":package-srcs"],
     tags = ["automanaged"],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["roundtrip_test.go"],
-    embed = [":go_default_library"],
-    deps = [
-        "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/fuzzer:go_default_library",
-    ],
+    visibility = ["//visibility:public"],
 )

staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/install/install.go → pkg/apis/apiserverinternal/install/install.go

@@ -21,8 +21,8 @@ package install
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/apiserver/pkg/apis/apiserverinternal"
-	"k8s.io/apiserver/pkg/apis/apiserverinternal/v1alpha1"
+	"k8s.io/kubernetes/pkg/apis/apiserverinternal"
+	"k8s.io/kubernetes/pkg/apis/apiserverinternal/v1alpha1"
 )
 
 // Install registers the API group and adds types to a scheme

staging/src/k8s.io/apiserver/pkg/apis/apiserverinternal/install/roundtrip_test.go → pkg/apis/apiserverinternal/install/roundtrip_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
-	"k8s.io/apiserver/pkg/apis/apiserverinternal/fuzzer"
+	"k8s.io/kubernetes/pkg/apis/apiserverinternal/fuzzer"
 )
 
 func TestRoundTrip(t *testing.T) {

pkg/apis/apiserverinternal/v1alpha1/BUILD

@@ -0,0 +1,34 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "doc.go",
+        "register.go",
+        "zz_generated.conversion.go",
+        "zz_generated.defaults.go",
+    ],
+    importpath = "k8s.io/kubernetes/pkg/apis/apiserverinternal/v1alpha1",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/apis/apiserverinternal:go_default_library",
+        "//staging/src/k8s.io/api/apiserverinternal/v1alpha1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)

pkg/apis/apiserverinternal/v1alpha1/doc.go

@@ -0,0 +1,26 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/apiserverinternal
+// +k8s:conversion-gen-external-types=k8s.io/api/apiserverinternal/v1alpha1
+// +k8s:defaulter-gen=TypeMeta
+// +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/apiserverinternal/v1alpha1
+
+// +groupName=internal.apiserver.k8s.io
+
+// Package v1alpha1 contains the v1alpha1 version of the API used by the
+// apiservers themselves.
+package v1alpha1 // import "k8s.io/kubernetes/pkg/apis/apiserverinternal/v1alpha1"

pkg/apis/apiserverinternal/v1alpha1/register.go

@@ -0,0 +1,46 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	apiserverinternalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// GroupName is the group name use in this package
+const GroupName = "internal.apiserver.k8s.io"
+
+// SchemeGroupVersion is group version used to register these objects
+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
+
+// Resource takes an unqualified resource and returns a Group qualified GroupResource
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
+
+var (
+	localSchemeBuilder = &apiserverinternalv1alpha1.SchemeBuilder
+	// AddToScheme adds api to a scheme
+	AddToScheme = localSchemeBuilder.AddToScheme
+)
+
+func init() {
+	// We only register manually written functions here. The registration of the
+	// generated functions takes place in the generated files. The separation
+	// makes the code compile even when the generated files are missing.
+	localSchemeBuilder.Register(RegisterDefaults)
+}