From bf8532c54e60fad5989864a10fef1cac69d5f1e7 Mon Sep 17 00:00:00 2001 From: David Eads Date: Wed, 25 Apr 2018 16:07:15 -0400 Subject: [PATCH] remove KUBE_API_VERSIONS Kubernetes-commit: a68c57155e728b2782408cbab88ecee0444a4ba8 --- pkg/endpoints/discovery/root_test.go | 2 +- pkg/server/resourceconfig/helpers_test.go | 2 +- pkg/server/storage/storage_factory_test.go | 5 ++-- pkg/util/webhook/webhook_test.go | 29 ++++--------------- plugin/pkg/audit/log/backend_test.go | 2 +- plugin/pkg/audit/webhook/webhook.go | 2 +- .../authenticator/token/webhook/webhook.go | 2 +- plugin/pkg/authorizer/webhook/webhook.go | 2 +- 8 files changed, 13 insertions(+), 33 deletions(-) diff --git a/pkg/endpoints/discovery/root_test.go b/pkg/endpoints/discovery/root_test.go index 6378cc311..851215dda 100644 --- a/pkg/endpoints/discovery/root_test.go +++ b/pkg/endpoints/discovery/root_test.go @@ -37,7 +37,7 @@ import ( ) var ( - registry = registered.NewOrDie("") + registry = registered.NewAPIRegistrationManager() scheme = runtime.NewScheme() codecs = serializer.NewCodecFactory(scheme) ) diff --git a/pkg/server/resourceconfig/helpers_test.go b/pkg/server/resourceconfig/helpers_test.go index df25a3964..29a44cc1e 100644 --- a/pkg/server/resourceconfig/helpers_test.go +++ b/pkg/server/resourceconfig/helpers_test.go @@ -166,7 +166,7 @@ func newFakeAPIResourceConfigSource() *serverstore.ResourceConfig { } func newFakeRegistry() *registered.APIRegistrationManager { - registry := registered.NewOrDie("") + registry := registered.NewAPIRegistrationManager() registry.RegisterGroup(apimachinery.GroupMeta{ GroupVersion: apiv1.SchemeGroupVersion, diff --git a/pkg/server/storage/storage_factory_test.go b/pkg/server/storage/storage_factory_test.go index f1a0f978b..0f9b455a3 100644 --- a/pkg/server/storage/storage_factory_test.go +++ b/pkg/server/storage/storage_factory_test.go @@ -17,7 +17,6 @@ limitations under the License. package storage import ( - "os" "reflect" "testing" @@ -35,7 +34,7 @@ import ( var ( v1GroupVersion = schema.GroupVersion{Group: "", Version: "v1"} - registry = registered.NewOrDie(os.Getenv("KUBE_API_VERSIONS")) + registry = registered.NewAPIRegistrationManager() scheme = runtime.NewScheme() codecs = serializer.NewCodecFactory(scheme) parameterCodec = runtime.NewParameterCodec(scheme) @@ -116,7 +115,7 @@ func TestConfigurableStorageFactory(t *testing.T) { } func TestUpdateEtcdOverrides(t *testing.T) { - registry := registered.NewOrDie(os.Getenv("KUBE_API_VERSIONS")) + registry := registered.NewAPIRegistrationManager() exampleinstall.Install(registry, scheme) testCases := []struct { diff --git a/pkg/util/webhook/webhook_test.go b/pkg/util/webhook/webhook_test.go index 8485e4f89..837561884 100644 --- a/pkg/util/webhook/webhook_test.go +++ b/pkg/util/webhook/webhook_test.go @@ -70,25 +70,6 @@ var ( retryBackoff = time.Duration(500) * time.Millisecond ) -// TestDisabledGroupVersion ensures that requiring a group version works as expected -func TestDisabledGroupVersion(t *testing.T) { - gv := schema.GroupVersion{Group: "webhook.util.k8s.io", Version: "v1"} - gvs := []schema.GroupVersion{gv} - registry := registered.NewOrDie(gv.String()) - _, err := NewGenericWebhook(registry, scheme.Codecs, "/some/path", gvs, retryBackoff) - - if err == nil { - t.Errorf("expected an error") - } else { - aErrMsg := err.Error() - eErrMsg := fmt.Sprintf("webhook plugin requires enabling extension resource: %s", gv) - - if aErrMsg != eErrMsg { - t.Errorf("unexpected error message mismatch:\n Expected: %s\n Actual: %s", eErrMsg, aErrMsg) - } - } -} - // TestKubeConfigFile ensures that a kube config file, regardless of validity, is handled properly func TestKubeConfigFile(t *testing.T) { badCAPath := "/tmp/missing/ca.pem" @@ -277,7 +258,7 @@ func TestKubeConfigFile(t *testing.T) { if err == nil { defer os.Remove(kubeConfigFile) - _, err = NewGenericWebhook(registered.NewOrDie(""), scheme.Codecs, kubeConfigFile, groupVersions, retryBackoff) + _, err = NewGenericWebhook(registered.NewAPIRegistrationManager(), scheme.Codecs, kubeConfigFile, groupVersions, retryBackoff) } return err @@ -300,7 +281,7 @@ func TestKubeConfigFile(t *testing.T) { // TestMissingKubeConfigFile ensures that a kube config path to a missing file is handled properly func TestMissingKubeConfigFile(t *testing.T) { kubeConfigPath := "/some/missing/path" - _, err := NewGenericWebhook(registered.NewOrDie(""), scheme.Codecs, kubeConfigPath, groupVersions, retryBackoff) + _, err := NewGenericWebhook(registered.NewAPIRegistrationManager(), scheme.Codecs, kubeConfigPath, groupVersions, retryBackoff) if err == nil { t.Errorf("creating the webhook should had failed") @@ -412,7 +393,7 @@ func TestTLSConfig(t *testing.T) { defer os.Remove(configFile) - wh, err := NewGenericWebhook(registered.NewOrDie(""), scheme.Codecs, configFile, groupVersions, retryBackoff) + wh, err := NewGenericWebhook(registered.NewAPIRegistrationManager(), scheme.Codecs, configFile, groupVersions, retryBackoff) if err == nil { err = wh.RestClient.Get().Do().Error() @@ -477,7 +458,7 @@ func TestRequestTimeout(t *testing.T) { var requestTimeout = 10 * time.Millisecond - wh, err := newGenericWebhook(registered.NewOrDie(""), scheme.Codecs, configFile, groupVersions, retryBackoff, requestTimeout) + wh, err := newGenericWebhook(registered.NewAPIRegistrationManager(), scheme.Codecs, configFile, groupVersions, retryBackoff, requestTimeout) if err != nil { t.Fatalf("failed to create the webhook: %v", err) } @@ -563,7 +544,7 @@ func TestWithExponentialBackoff(t *testing.T) { defer os.Remove(configFile) - wh, err := NewGenericWebhook(registered.NewOrDie(""), scheme.Codecs, configFile, groupVersions, retryBackoff) + wh, err := NewGenericWebhook(registered.NewAPIRegistrationManager(), scheme.Codecs, configFile, groupVersions, retryBackoff) if err != nil { t.Fatalf("failed to create the webhook: %v", err) diff --git a/plugin/pkg/audit/log/backend_test.go b/plugin/pkg/audit/log/backend_test.go index 491972061..a58e2d31b 100644 --- a/plugin/pkg/audit/log/backend_test.go +++ b/plugin/pkg/audit/log/backend_test.go @@ -38,7 +38,7 @@ import ( // NOTE: Copied from webhook backend to register auditv1beta1 to scheme var ( - registry = registered.NewOrDie("") + registry = registered.NewAPIRegistrationManager() ) func init() { diff --git a/plugin/pkg/audit/webhook/webhook.go b/plugin/pkg/audit/webhook/webhook.go index 517395b84..b36f45ef3 100644 --- a/plugin/pkg/audit/webhook/webhook.go +++ b/plugin/pkg/audit/webhook/webhook.go @@ -45,7 +45,7 @@ var ( // // Can we make these passable to NewGenericWebhook? // TODO(audit): figure out a general way to let the client choose their preferred version - registry = registered.NewOrDie("") + registry = registered.NewAPIRegistrationManager() ) func init() { diff --git a/plugin/pkg/authenticator/token/webhook/webhook.go b/plugin/pkg/authenticator/token/webhook/webhook.go index 26f350d2b..77cd097f3 100644 --- a/plugin/pkg/authenticator/token/webhook/webhook.go +++ b/plugin/pkg/authenticator/token/webhook/webhook.go @@ -116,7 +116,7 @@ func (w *WebhookTokenAuthenticator) AuthenticateToken(token string) (user.Info, // authentication/v1beta1. We construct a registry that acknowledges // authentication/v1beta1 as an enabled version to pass a check enforced in // NewGenericWebhook. -var registry = registered.NewOrDie("") +var registry = registered.NewAPIRegistrationManager() func init() { registry.RegisterVersions(groupVersions) diff --git a/plugin/pkg/authorizer/webhook/webhook.go b/plugin/pkg/authorizer/webhook/webhook.go index c0253bb89..7f1a3d99f 100644 --- a/plugin/pkg/authorizer/webhook/webhook.go +++ b/plugin/pkg/authorizer/webhook/webhook.go @@ -238,7 +238,7 @@ func convertToSARExtra(extra map[string][]string) map[string]authorization.Extra // authorization/v1beta1. We construct a registry that acknowledges // authorization/v1beta1 as an enabled version to pass a check enforced in // NewGenericWebhook. -var registry = registered.NewOrDie("") +var registry = registered.NewAPIRegistrationManager() func init() { registry.RegisterVersions(groupVersions)