Merge pull request kubernetes#92064 from roycaihw/storage-version/serve-api

Serve storage-versions API in kube-apiserver

Author: k8s-ci-robot

api/openapi-spec/swagger.json

@@ -275,6 +275,7 @@ var apiVersionPriorities = map[schema.GroupVersion]priority{
 	{Group: "discovery.k8s.io", Version: "v1beta1"}:              {group: 16200, version: 12},
 	{Group: "discovery.k8s.io", Version: "v1alpha1"}:             {group: 16200, version: 9},
 	{Group: "flowcontrol.apiserver.k8s.io", Version: "v1alpha1"}: {group: 16100, version: 9},
+	{Group: "internal.apiserver.k8s.io", Version: "v1alpha1"}:    {group: 16000, 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

@@ -6,6 +6,7 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/apis/apiserverinternal/install",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/api/legacyscheme:go_default_library",
         "//pkg/apis/apiserverinternal:go_default_library",
         "//pkg/apis/apiserverinternal/v1alpha1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",

pkg/apis/apiserverinternal/install/BUILD

@@ -21,10 +21,15 @@ package install
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/apis/apiserverinternal"
 	"k8s.io/kubernetes/pkg/apis/apiserverinternal/v1alpha1"
 )
 
+func init() {
+	Install(legacyscheme.Scheme)
+}
+
 // Install registers the API group and adds types to a scheme
 func Install(scheme *runtime.Scheme) {
 	utilruntime.Must(apiserverinternal.AddToScheme(scheme))

pkg/apis/apiserverinternal/install/install.go

@@ -7,6 +7,7 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/apis/apiserverinternal:go_default_library",
+        "//pkg/apis/core/validation:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/validation:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",

pkg/apis/apiserverinternal/validation/BUILD

@@ -25,10 +25,42 @@ import (
 	utilvalidation "k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/kubernetes/pkg/apis/apiserverinternal"
+	apivalidation "k8s.io/kubernetes/pkg/apis/core/validation"
 )
 
 // ValidateStorageVersion validate the storage version object.
 func ValidateStorageVersion(sv *apiserverinternal.StorageVersion) field.ErrorList {
+	var allErrs field.ErrorList
+	allErrs = append(allErrs, apivalidation.ValidateObjectMeta(&sv.ObjectMeta, false, ValidateStorageVersionName, field.NewPath("metadata"))...)
+	allErrs = append(allErrs, validateStorageVersionStatus(sv.Status, field.NewPath("status"))...)
+	return allErrs
+}
+
+// ValidateStorageVersionName is a ValidateNameFunc for storage version names
+func ValidateStorageVersionName(name string, prefix bool) []string {
+	var allErrs []string
+	idx := strings.LastIndex(name, ".")
+	if idx < 0 {
+		allErrs = append(allErrs, "name must be in the form of <group>.<resource>")
+	} else {
+		for _, msg := range utilvalidation.IsDNS1123Subdomain(name[:idx]) {
+			allErrs = append(allErrs, "the group segment "+msg)
+		}
+		for _, msg := range utilvalidation.IsDNS1035Label(name[idx+1:]) {
+			allErrs = append(allErrs, "the resource segment "+msg)
+		}
+	}
+	return allErrs
+}
+
+// ValidateStorageVersionUpdate tests if an update to a StorageVersion is valid.
+func ValidateStorageVersionUpdate(sv, oldSV *apiserverinternal.StorageVersion) field.ErrorList {
+	// no error since StorageVersionSpec is an empty spec
+	return field.ErrorList{}
+}
+
+// ValidateStorageVersionStatusUpdate tests if an update to a StorageVersionStatus is valid.
+func ValidateStorageVersionStatusUpdate(sv, oldSV *apiserverinternal.StorageVersion) field.ErrorList {
 	var allErrs field.ErrorList
 	allErrs = append(allErrs, validateStorageVersionStatus(sv.Status, field.NewPath("status"))...)
 	return allErrs

pkg/apis/apiserverinternal/validation/validation.go

@@ -284,3 +284,66 @@ func TestValidateStorageVersionCondition(t *testing.T) {
 		}
 	}
 }
+
+func TestValidateStorageVersionName(t *testing.T) {
+	cases := []struct {
+		name        string
+		expectedErr string
+	}{
+		{
+			name:        "",
+			expectedErr: `name must be in the form of <group>.<resource>`,
+		},
+		{
+			name:        "pods",
+			expectedErr: `name must be in the form of <group>.<resource>`,
+		},
+		{
+			name:        "core.pods",
+			expectedErr: "",
+		},
+		{
+			name:        "authentication.k8s.io.tokenreviews",
+			expectedErr: "",
+		},
+		{
+			name:        strings.Repeat("x", 253) + ".tokenreviews",
+			expectedErr: "",
+		},
+		{
+			name:        strings.Repeat("x", 254) + ".tokenreviews",
+			expectedErr: `the group segment must be no more than 253 characters`,
+		},
+		{
+			name:        "authentication.k8s.io." + strings.Repeat("x", 63),
+			expectedErr: "",
+		},
+		{
+			name:        "authentication.k8s.io." + strings.Repeat("x", 64),
+			expectedErr: `the resource segment must be no more than 63 characters`,
+		},
+	}
+	for _, tc := range cases {
+		errs := ValidateStorageVersionName(tc.name, false)
+		if errs == nil && len(tc.expectedErr) == 0 {
+			continue
+		}
+		if errs != nil && len(tc.expectedErr) == 0 {
+			t.Errorf("unexpected error %v", errs)
+			continue
+		}
+		if errs == nil && len(tc.expectedErr) != 0 {
+			t.Errorf("unexpected empty error")
+			continue
+		}
+		found := false
+		for _, msg := range errs {
+			if msg == tc.expectedErr {
+				found = true
+			}
+		}
+		if !found {
+			t.Errorf("expected error to contain %s, got %v", tc.expectedErr, errs)
+		}
+	}
+}

pkg/apis/apiserverinternal/validation/validation_test.go

@@ -44,6 +44,7 @@ go_library(
         "//pkg/kubeapiserver/options:go_default_library",
         "//pkg/kubelet/client:go_default_library",
         "//pkg/registry/admissionregistration/rest:go_default_library",
+        "//pkg/registry/apiserverinternal/rest:go_default_library",
         "//pkg/registry/apps/rest:go_default_library",
         "//pkg/registry/authentication/rest:go_default_library",
         "//pkg/registry/authorization/rest:go_default_library",
@@ -72,6 +73,7 @@ go_library(
         "//pkg/util/node:go_default_library",
         "//staging/src/k8s.io/api/admissionregistration/v1:go_default_library",
         "//staging/src/k8s.io/api/admissionregistration/v1beta1:go_default_library",
+        "//staging/src/k8s.io/api/apiserverinternal/v1alpha1:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/authentication/v1:go_default_library",
         "//staging/src/k8s.io/api/authentication/v1beta1:go_default_library",

pkg/controlplane/BUILD

@@ -27,6 +27,7 @@ import (
 
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
+	apiserverinternalv1alpha1 "k8s.io/api/apiserverinternal/v1alpha1"
 	appsv1 "k8s.io/api/apps/v1"
 	authenticationv1 "k8s.io/api/authentication/v1"
 	authenticationv1beta1 "k8s.io/api/authentication/v1beta1"
@@ -93,6 +94,7 @@ import (
 
 	// RESTStorage installers
 	admissionregistrationrest "k8s.io/kubernetes/pkg/registry/admissionregistration/rest"
+	apiserverinternalrest "k8s.io/kubernetes/pkg/registry/apiserverinternal/rest"
 	appsrest "k8s.io/kubernetes/pkg/registry/apps/rest"
 	authenticationrest "k8s.io/kubernetes/pkg/registry/authentication/rest"
 	authorizationrest "k8s.io/kubernetes/pkg/registry/authorization/rest"
@@ -415,6 +417,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
 	// TODO: describe the priority all the way down in the RESTStorageProviders and plumb it back through the various discovery
 	// handlers that we have.
 	restStorageProviders := []RESTStorageProvider{
+		apiserverinternalrest.StorageProvider{},
 		authenticationrest.RESTStorageProvider{Authenticator: c.GenericConfig.Authentication.Authenticator, APIAudiences: c.GenericConfig.Authentication.APIAudiences},
 		authorizationrest.RESTStorageProvider{Authorizer: c.GenericConfig.Authorization.Authorizer, RuleResolver: c.GenericConfig.RuleResolver},
 		autoscalingrest.RESTStorageProvider{},
@@ -633,6 +636,7 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
 	)
 	// disable alpha versions explicitly so we have a full list of what's possible to serve
 	ret.DisableVersions(
+		apiserverinternalv1alpha1.SchemeGroupVersion,
 		batchapiv2alpha1.SchemeGroupVersion,
 		nodev1alpha1.SchemeGroupVersion,
 		rbacv1alpha1.SchemeGroupVersion,

pkg/controlplane/master.go

@@ -14,6 +14,7 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
+        "//pkg/apis/apiserverinternal:go_default_library",
         "//pkg/apis/apps:go_default_library",
         "//pkg/apis/autoscaling:go_default_library",
         "//pkg/apis/batch:go_default_library",
@@ -47,6 +48,7 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/printers/internalversion",
     deps = [
         "//pkg/apis/admissionregistration:go_default_library",
+        "//pkg/apis/apiserverinternal:go_default_library",
         "//pkg/apis/apps:go_default_library",
         "//pkg/apis/apps/install:go_default_library",
         "//pkg/apis/authentication/install:go_default_library",
@@ -83,6 +85,7 @@ go_library(
         "//pkg/features:go_default_library",
         "//pkg/printers:go_default_library",
         "//pkg/util/node:go_default_library",
+        "//staging/src/k8s.io/api/apiserverinternal/v1alpha1:go_default_library",
         "//staging/src/k8s.io/api/apps/v1beta1:go_default_library",
         "//staging/src/k8s.io/api/autoscaling/v2beta1:go_default_library",
         "//staging/src/k8s.io/api/batch/v1:go_default_library",