Merge pull request kubernetes#80766 from robscott/discovery-api

Adding Discovery API for EndpointSlice

Author: k8s-ci-robot

api/openapi-spec/swagger.json

@@ -60,6 +60,7 @@ tags_values_pkgs = {"openapi-gen": {
         "staging/src/k8s.io/api/coordination/v1",
         "staging/src/k8s.io/api/coordination/v1beta1",
         "staging/src/k8s.io/api/core/v1",
+        "staging/src/k8s.io/api/discovery/v1alpha1",
         "staging/src/k8s.io/api/events/v1beta1",
         "staging/src/k8s.io/api/extensions/v1beta1",
         "staging/src/k8s.io/api/imagepolicy/v1alpha1",
@@ -141,6 +142,7 @@ tags_pkgs_values = {"openapi-gen": {
         "false",
         "true",
     ],
+    "staging/src/k8s.io/api/discovery/v1alpha1": ["true"],
     "staging/src/k8s.io/api/events/v1beta1": ["true"],
     "staging/src/k8s.io/api/extensions/v1beta1": ["true"],
     "staging/src/k8s.io/api/imagepolicy/v1alpha1": ["true"],

build/kazel_generated.bzl

@@ -281,6 +281,7 @@ var apiVersionPriorities = map[schema.GroupVersion]priority{
 	{Group: "auditregistration.k8s.io", Version: "v1alpha1"}:    {group: 16400, version: 1},
 	{Group: "node.k8s.io", Version: "v1alpha1"}:                 {group: 16300, version: 1},
 	{Group: "node.k8s.io", Version: "v1beta1"}:                  {group: 16300, version: 9},
+	{Group: "discovery.k8s.io", Version: "v1alpha1"}:            {group: 16200, version: 9},
 	// Append a new group to the end of the list if unsure.
 	// You can use min(existing group)-100 as the initial value for a group.
 	// Version can be set to 9 (to have space around) for a new group.

cmd/kube-apiserver/app/aggregator.go

@@ -32,6 +32,7 @@ pkg/apis/core/v1/helper
 pkg/apis/core/v1/helper/qos
 pkg/apis/core/v1/validation
 pkg/apis/core/validation
+pkg/apis/discovery/v1alpha1
 pkg/apis/events/v1beta1
 pkg/apis/extensions
 pkg/apis/extensions/v1beta1

hack/.golint_failures

@@ -18,6 +18,7 @@
   "k8s.io/api/coordination/v1": "coordinationv1",
   "k8s.io/api/coordination/v1beta1": "coordinationv1beta1",
   "k8s.io/api/core/v1": "v1",
+  "k8s.io/api/discovery/v1alpha1": "discoveryv1alpha1",
   "k8s.io/api/events/v1beta1": "eventsv1beta1",
   "k8s.io/api/extensions/v1beta1": "extensionsv1beta1",
   "k8s.io/api/imagepolicy/v1alpha1": "imagepolicyv1alpha1",

hack/.import-aliases

@@ -84,6 +84,7 @@ batch/v2alpha1 \
 certificates.k8s.io/v1beta1 \
 coordination.k8s.io/v1beta1 \
 coordination.k8s.io/v1 \
+discovery.k8s.io/v1alpha1 \
 extensions/v1beta1 \
 events.k8s.io/v1beta1 \
 imagepolicy.k8s.io/v1alpha1 \

hack/lib/init.sh

@@ -38,6 +38,7 @@ filegroup(
         "//pkg/apis/certificates:all-srcs",
         "//pkg/apis/coordination:all-srcs",
         "//pkg/apis/core:all-srcs",
+        "//pkg/apis/discovery:all-srcs",
         "//pkg/apis/events:all-srcs",
         "//pkg/apis/extensions:all-srcs",
         "//pkg/apis/imagepolicy:all-srcs",

pkg/BUILD

@@ -33,6 +33,8 @@ go_library(
         "//pkg/apis/coordination/install:go_default_library",
         "//pkg/apis/core:go_default_library",
         "//pkg/apis/core/install:go_default_library",
+        "//pkg/apis/discovery:go_default_library",
+        "//pkg/apis/discovery/install:go_default_library",
         "//pkg/apis/events:go_default_library",
         "//pkg/apis/events/install:go_default_library",
         "//pkg/apis/extensions:go_default_library",

pkg/api/testapi/BUILD

@@ -44,6 +44,7 @@ import (
 	"k8s.io/kubernetes/pkg/apis/certificates"
 	"k8s.io/kubernetes/pkg/apis/coordination"
 	api "k8s.io/kubernetes/pkg/apis/core"
+	"k8s.io/kubernetes/pkg/apis/discovery"
 	"k8s.io/kubernetes/pkg/apis/events"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/apis/imagepolicy"
@@ -67,6 +68,7 @@ import (
 	_ "k8s.io/kubernetes/pkg/apis/certificates/install"
 	_ "k8s.io/kubernetes/pkg/apis/coordination/install"
 	_ "k8s.io/kubernetes/pkg/apis/core/install"
+	_ "k8s.io/kubernetes/pkg/apis/discovery/install"
 	_ "k8s.io/kubernetes/pkg/apis/events/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 	_ "k8s.io/kubernetes/pkg/apis/imagepolicy/install"
@@ -283,6 +285,12 @@ func init() {
 			externalGroupVersion: externalGroupVersion,
 		}
 	}
+	if _, ok := Groups[discovery.GroupName]; !ok {
+		externalGroupVersion := schema.GroupVersion{Group: discovery.GroupName, Version: legacyscheme.Scheme.PrioritizedVersionsForGroup(discovery.GroupName)[0].Version}
+		Groups[discovery.GroupName] = TestGroup{
+			externalGroupVersion: externalGroupVersion,
+		}
+	}
 
 	Default = Groups[api.GroupName]
 	Autoscaling = Groups[autoscaling.GroupName]

pkg/api/testapi/testapi.go

@@ -26,6 +26,7 @@ go_library(
         "//pkg/apis/certificates/fuzzer:go_default_library",
         "//pkg/apis/core:go_default_library",
         "//pkg/apis/core/fuzzer:go_default_library",
+        "//pkg/apis/discovery/fuzzer:go_default_library",
         "//pkg/apis/extensions/fuzzer:go_default_library",
         "//pkg/apis/networking/fuzzer:go_default_library",
         "//pkg/apis/policy/fuzzer:go_default_library",