github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 20:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117993 from liggitt/shortnames

Browse Source 
Undo 1.28 shortname additions for now
This commit is contained in:
Kubernetes Prow Robot 2023-05-15 11:05:27 -07:00 committed by GitHub
commit 1d6158e11b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 0 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/registry/admissionregistration/mutatingwebhookconfiguration/storage/storage.go
View File

@ -64,8 +64,3 @@ var _ rest.CategoriesProvider = &REST{}
func (r *REST) Categories() []string { func (r *REST) Categories() []string {
return []string{"api-extensions"} return []string{"api-extensions"}
} }
// ShortNames implements the ShortNamesProvider interface. Returns a list of short names for a resource.
func (r *REST) ShortNames() []string {
return []string{"mwc"}
}

51
pkg/registry/admissionregistration/mutatingwebhookconfiguration/storage/storage_test.go
View File

@ -1,51 +0,0 @@
/*
Copyright 2021 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 storage
import (
"testing"
"k8s.io/apiserver/pkg/registry/generic"
etcd3testing "k8s.io/apiserver/pkg/storage/etcd3/testing"
"k8s.io/kubernetes/pkg/apis/admissionregistration"
"k8s.io/kubernetes/pkg/registry/registrytest"
// Ensure that admissionregistration package is initialized.
_ "k8s.io/kubernetes/pkg/apis/admissionregistration/install"
)
func newStorage(t *testing.T) (*REST, *etcd3testing.EtcdTestServer) {
etcdStorage, server := registrytest.NewEtcdStorage(t, admissionregistration.GroupName)
restOptions := generic.RESTOptions{
StorageConfig: etcdStorage,
Decorator: generic.UndecoratedStorage,
DeleteCollectionWorkers: 1,
ResourcePrefix: "mutatingwebhookconfigurations"}
storage, err := NewREST(restOptions)
if err != nil {
t.Fatalf("unexpected error from REST storage: %v", err)
}
return storage, server
}
func TestShortNames(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
expected := []string{"mwc"}
registrytest.AssertShortNames(t, storage, expected)
}

5
pkg/registry/admissionregistration/validatingwebhookconfiguration/storage/storage.go
View File

@ -64,8 +64,3 @@ var _ rest.CategoriesProvider = &REST{}
func (r *REST) Categories() []string { func (r *REST) Categories() []string {
return []string{"api-extensions"} return []string{"api-extensions"}
} }
// ShortNames implements the ShortNamesProvider interface. Returns a list of short names for a resource.
func (r *REST) ShortNames() []string {
return []string{"vwc"}
}

8
pkg/registry/admissionregistration/validatingwebhookconfiguration/storage/storage_test.go
View File

@ -199,11 +199,3 @@ func TestCategories(t *testing.T) {
expected := []string{"api-extensions"} expected := []string{"api-extensions"}
registrytest.AssertCategories(t, storage, expected) registrytest.AssertCategories(t, storage, expected)
} }
func TestShortNames(t *testing.T) {
storage, server := newStorage(t)
defer server.Terminate(t)
defer storage.Store.DestroyFunc()
expected := []string{"vwc"}
registrytest.AssertShortNames(t, storage, expected)
}

8
pkg/registry/flowcontrol/flowschema/storage/storage.go
View File

@ -72,14 +72,6 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, error) {
return &REST{store}, &StatusREST{store: &statusStore}, nil return &REST{store}, &StatusREST{store: &statusStore}, nil
} }
// Implement ShortNamesProvider
var _ rest.ShortNamesProvider = &REST{}
// ShortNames implements the ShortNamesProvider interface. Returns a list of short names for a resource.
func (r *REST) ShortNames() []string {
return []string{"fs"}
}
// StatusREST implements the REST endpoint for changing the status of a flow schema. // StatusREST implements the REST endpoint for changing the status of a flow schema.
type StatusREST struct { type StatusREST struct {
store *genericregistry.Store store *genericregistry.Store

8
pkg/registry/flowcontrol/prioritylevelconfiguration/storage/storage.go
View File

@ -72,14 +72,6 @@ func NewREST(optsGetter generic.RESTOptionsGetter) (*REST, *StatusREST, error) {
return &REST{store}, &StatusREST{store: &statusStore}, nil return &REST{store}, &StatusREST{store: &statusStore}, nil
} }
// Implement ShortNamesProvider
var _ rest.ShortNamesProvider = &REST{}
// ShortNames implements the ShortNamesProvider interface. Returns a list of short names for a resource.
func (r *REST) ShortNames() []string {
return []string{"plc"}
}
// StatusREST implements the REST endpoint for changing the status of a priority level configuration. // StatusREST implements the REST endpoint for changing the status of a priority level configuration.
type StatusREST struct { type StatusREST struct {
store *genericregistry.Store store *genericregistry.Store