Add missing error handling in schema-related code

cmd/cloud-controller-manager/app/options/options.go

@@ -114,8 +114,12 @@ func NewCloudControllerManagerOptions() (*CloudControllerManagerOptions, error)
 // NewDefaultComponentConfig returns cloud-controller manager configuration object.
 func NewDefaultComponentConfig(insecurePort int32) (componentconfig.CloudControllerManagerConfiguration, error) {
  scheme := runtime.NewScheme()
- componentconfigv1alpha1.AddToScheme(scheme)
- componentconfig.AddToScheme(scheme)
+ if err := componentconfigv1alpha1.AddToScheme(scheme); err != nil {
+ return componentconfig.CloudControllerManagerConfiguration{}, err
+ }
+ if err := componentconfig.AddToScheme(scheme); err != nil {
+ return componentconfig.CloudControllerManagerConfiguration{}, err
+ }
 
  versioned := componentconfigv1alpha1.CloudControllerManagerConfiguration{}
  scheme.Default(&versioned)

cmd/kube-controller-manager/app/options/options.go

@@ -208,8 +208,12 @@ func NewKubeControllerManagerOptions() (*KubeControllerManagerOptions, error) {
 // NewDefaultComponentConfig returns kube-controller manager configuration object.
 func NewDefaultComponentConfig(insecurePort int32) (componentconfig.KubeControllerManagerConfiguration, error) {
  scheme := runtime.NewScheme()
- componentconfigv1alpha1.AddToScheme(scheme)
- componentconfig.AddToScheme(scheme)
+ if err := componentconfigv1alpha1.AddToScheme(scheme); err != nil {
+ return componentconfig.KubeControllerManagerConfiguration{}, err
+ }
+ if err := componentconfig.AddToScheme(scheme); err != nil {
+ return componentconfig.KubeControllerManagerConfiguration{}, err
+ }
 
  versioned := componentconfigv1alpha1.KubeControllerManagerConfiguration{}
  scheme.Default(&versioned)

cmd/kube-scheduler/app/options/BUILD

@@ -23,6 +23,7 @@ go_library(
  "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json:go_default_library",
+ "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
  "//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
  "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",

cmd/kube-scheduler/app/options/configfile.go

@@ -25,6 +25,7 @@ import (
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/apimachinery/pkg/runtime/serializer"
  "k8s.io/apimachinery/pkg/runtime/serializer/json"
+ utilruntime "k8s.io/apimachinery/pkg/util/runtime"
  "k8s.io/kubernetes/pkg/apis/componentconfig"
  componentconfigv1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"
 )
@@ -35,8 +36,8 @@ var (
 )
 
 func init() {
- componentconfig.AddToScheme(configScheme)
- componentconfigv1alpha1.AddToScheme(configScheme)
+ utilruntime.Must(componentconfig.AddToScheme(configScheme))
+ utilruntime.Must(componentconfigv1alpha1.AddToScheme(configScheme))
 }
 
 func loadConfigFromFile(file string) (*componentconfig.KubeSchedulerConfiguration, error) {

cmd/kubeadm/app/apis/kubeadm/scheme/BUILD

@@ -13,6 +13,7 @@ go_library(
  "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
+ "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
  ],
 )
 

cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go

@@ -21,6 +21,7 @@ import (
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/apimachinery/pkg/runtime/schema"
  "k8s.io/apimachinery/pkg/runtime/serializer"
+ utilruntime "k8s.io/apimachinery/pkg/util/runtime"
  "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
  "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
  "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha2"
@@ -39,8 +40,8 @@ func init() {
 
 // AddToScheme builds the Kubeadm scheme using all known versions of the kubeadm api.
 func AddToScheme(scheme *runtime.Scheme) {
- kubeadm.AddToScheme(scheme)
- v1alpha1.AddToScheme(scheme)
- v1alpha2.AddToScheme(scheme)
- scheme.SetVersionPriority(v1alpha1.SchemeGroupVersion)
+ utilruntime.Must(kubeadm.AddToScheme(scheme))
+ utilruntime.Must(v1alpha1.AddToScheme(scheme))
+ utilruntime.Must(v1alpha2.AddToScheme(scheme))
+ utilruntime.Must(scheme.SetVersionPriority(v1alpha1.SchemeGroupVersion))
 }

cmd/kubeadm/app/util/config/BUILD

@@ -53,6 +53,7 @@ go_test(
  "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
  "//vendor/github.com/pmezard/go-difflib/difflib:go_default_library",
+ "//vendor/github.com/stretchr/testify/require:go_default_library",
  ],
 )
 

cmd/kubeadm/app/util/config/masterconfig_test.go

@@ -22,6 +22,7 @@ import (
  "testing"
 
  "github.com/pmezard/go-difflib/difflib"
+ "github.com/stretchr/testify/require"
 
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/apimachinery/pkg/runtime/schema"
@@ -159,7 +160,7 @@ func TestUpgrade(t *testing.T) {
  }
 
  scheme := runtime.NewScheme()
- v1alpha1.AddToScheme(scheme)
+ require.NoError(t, v1alpha1.AddToScheme(scheme))
  codecs := serializer.NewCodecFactory(scheme)
 
  obj := &v1alpha1.MasterConfiguration{}

pkg/api/ref/BUILD

@@ -16,6 +16,7 @@ go_test(
  "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
+ "//vendor/github.com/stretchr/testify/require:go_default_library",
  ],
 )
 

pkg/api/ref/ref_test.go

@@ -20,6 +20,8 @@ import (
  "reflect"
  "testing"
 
+ "github.com/stretchr/testify/require"
+
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/apimachinery/pkg/runtime/schema"
@@ -53,7 +55,7 @@ func TestGetReference(t *testing.T) {
  // then you run into trouble because the types aren't registered in the scheme by anything. This does the
  // register manually to allow unit test execution
  if _, _, err := legacyscheme.Scheme.ObjectKinds(&api.Pod{}); err != nil {
- api.AddToScheme(legacyscheme.Scheme)
+ require.NoError(t, api.AddToScheme(legacyscheme.Scheme))
  }
 
  table := map[string]struct {

pkg/kubectl/cmd/BUILD

@@ -224,6 +224,7 @@ go_test(
  "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
+ "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testing:go_default_library",

pkg/kubectl/cmd/cmd_test.go

@@ -33,6 +33,7 @@ import (
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/apimachinery/pkg/runtime/schema"
+ utilruntime "k8s.io/apimachinery/pkg/util/runtime"
  restclient "k8s.io/client-go/rest"
  "k8s.io/kubernetes/pkg/api/testapi"
  apitesting "k8s.io/kubernetes/pkg/api/testing"
@@ -43,7 +44,7 @@ import (
 
 // This init should be removed after switching this command and its tests to user external types.
 func init() {
- api.AddToScheme(scheme.Scheme)
+ utilruntime.Must(api.AddToScheme(scheme.Scheme))
 }
 
 func initTestErrorHandler(t *testing.T) {

pkg/kubectl/cmd/expose_test.go

@@ -26,6 +26,7 @@ import (
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/apimachinery/pkg/runtime/schema"
  "k8s.io/apimachinery/pkg/util/intstr"
+ utilruntime "k8s.io/apimachinery/pkg/util/runtime"
  "k8s.io/client-go/rest/fake"
  "k8s.io/kubernetes/pkg/api/legacyscheme"
  api "k8s.io/kubernetes/pkg/apis/core"
@@ -36,7 +37,7 @@ import (
 
 // This init should be removed after switching this command and its tests to user external types.
 func init() {
- api.AddToScheme(scheme.Scheme)
+ utilruntime.Must(api.AddToScheme(scheme.Scheme))
 }
 
 func TestRunExposeService(t *testing.T) {

pkg/kubectl/cmd/get/BUILD

@@ -84,6 +84,7 @@ go_test(
  "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/streaming:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
+ "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
  "//staging/src/k8s.io/client-go/rest:go_default_library",
  "//staging/src/k8s.io/client-go/rest/fake:go_default_library",

pkg/kubectl/cmd/get/get_test.go

@@ -33,6 +33,7 @@ import (
  "k8s.io/apimachinery/pkg/runtime/schema"
  "k8s.io/apimachinery/pkg/runtime/serializer/json"
  "k8s.io/apimachinery/pkg/runtime/serializer/streaming"
+ utilruntime "k8s.io/apimachinery/pkg/util/runtime"
  "k8s.io/apimachinery/pkg/watch"
  restclient "k8s.io/client-go/rest"
  "k8s.io/client-go/rest/fake"
@@ -56,9 +57,9 @@ var openapiSchemaPath = filepath.Join("..", "..", "..", "..", "api", "openapi-sp
 
 // This init should be removed after switching this command and its tests to user external types.
 func init() {
- api.AddToScheme(scheme.Scheme)
- scheme.Scheme.AddConversionFuncs(v1.Convert_core_PodSpec_To_v1_PodSpec)
- scheme.Scheme.AddConversionFuncs(v1.Convert_v1_PodSecurityContext_To_core_PodSecurityContext)
+ utilruntime.Must(api.AddToScheme(scheme.Scheme))
+ utilruntime.Must(scheme.Scheme.AddConversionFuncs(v1.Convert_core_PodSpec_To_v1_PodSpec))
+ utilruntime.Must(scheme.Scheme.AddConversionFuncs(v1.Convert_v1_PodSecurityContext_To_core_PodSecurityContext))
 }
 
 var unstructuredSerializer = resource.UnstructuredPlusDefaultContentConfig().NegotiatedSerializer

pkg/kubectl/cmd/run_test.go

@@ -33,6 +33,7 @@ import (
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/apimachinery/pkg/runtime/schema"
  "k8s.io/apimachinery/pkg/util/intstr"
+ utilruntime "k8s.io/apimachinery/pkg/util/runtime"
  restclient "k8s.io/client-go/rest"
  "k8s.io/client-go/rest/fake"
  "k8s.io/kubernetes/pkg/api/legacyscheme"
@@ -46,7 +47,7 @@ import (
 
 // This init should be removed after switching this command and its tests to user external types.
 func init() {
- api.AddToScheme(scheme.Scheme)
+ utilruntime.Must(api.AddToScheme(scheme.Scheme))
 }
 
 func TestGetRestartPolicy(t *testing.T) {

pkg/proxy/apis/kubeproxyconfig/scheme/BUILD

@@ -10,6 +10,7 @@ go_library(
  "//pkg/proxy/apis/kubeproxyconfig/v1alpha1:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
+ "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
  ],
 )
 

pkg/proxy/apis/kubeproxyconfig/scheme/scheme.go

@@ -19,6 +19,7 @@ package scheme
 import (
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/apimachinery/pkg/runtime/serializer"
+ utilruntime "k8s.io/apimachinery/pkg/util/runtime"
  "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig"
  "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1"
 )
@@ -37,6 +38,6 @@ func init() {
 
 // AddToScheme adds the types of this group into the given scheme.
 func AddToScheme(scheme *runtime.Scheme) {
- v1alpha1.AddToScheme(scheme)
- kubeproxyconfig.AddToScheme(scheme)
+ utilruntime.Must(v1alpha1.AddToScheme(scheme))
+ utilruntime.Must(kubeproxyconfig.AddToScheme(scheme))
 }

staging/src/k8s.io/api/BUILD

@@ -42,6 +42,7 @@ go_test(
  "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
+ "//vendor/github.com/stretchr/testify/require:go_default_library",
  ],
 )
 

staging/src/k8s.io/api/roundtrip_test.go

@@ -52,6 +52,7 @@ import (
  storagev1alpha1 "k8s.io/api/storage/v1alpha1"
  storagev1beta1 "k8s.io/api/storage/v1beta1"
 
+ "github.com/stretchr/testify/require"
  "k8s.io/apimachinery/pkg/api/testing/fuzzer"
  "k8s.io/apimachinery/pkg/api/testing/roundtrip"
  genericfuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer"
@@ -100,7 +101,7 @@ func TestRoundTripExternalTypes(t *testing.T) {
  scheme := runtime.NewScheme()
  codecs := serializer.NewCodecFactory(scheme)
 
- builder.AddToScheme(scheme)
+ require.NoError(t, builder.AddToScheme(scheme))
  seed := rand.Int63()
  // I'm only using the generic fuzzer funcs, but at some point in time we might need to
  // switch to specialized. For now we're happy with the current serialization test.
@@ -119,7 +120,7 @@ func TestFailRoundTrip(t *testing.T) {
  metav1.AddToGroupVersion(scheme, groupVersion)
  return nil
  })
- builder.AddToScheme(scheme)
+ require.NoError(t, builder.AddToScheme(scheme))
  seed := rand.Int63()
  fuzzer := fuzzer.FuzzerFor(genericfuzzer.Funcs, rand.NewSource(seed), codecs)
  tmpT := new(testing.T)

staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/register.go

@@ -57,7 +57,7 @@ func addToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion)
  if err := scheme.AddIgnoredConversionType(&metav1.TypeMeta{}, &metav1.TypeMeta{}); err != nil {
  return err
  }
- scheme.AddConversionFuncs(
+ err := scheme.AddConversionFuncs(
  metav1.Convert_string_To_labels_Selector,
  metav1.Convert_labels_Selector_To_string,
 
@@ -70,6 +70,9 @@ func addToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion)
  Convert_internalversion_ListOptions_To_v1_ListOptions,
  Convert_v1_ListOptions_To_internalversion_ListOptions,
  )
+ if err != nil {
+ return err
+ }
  // ListOptions is the only options struct which needs conversion (it exposes labels and fields
  // as selectors for convenience). The other types have only a single representation today.
  scheme.AddKnownTypes(SchemeGroupVersion,

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/BUILD

@@ -64,6 +64,7 @@ go_library(
  "//staging/src/k8s.io/apimachinery/pkg/selection:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
+ "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
  "//vendor/github.com/gogo/protobuf/proto:go_default_library",
  "//vendor/github.com/gogo/protobuf/sortkeys:go_default_library",

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/register.go

@@ -19,6 +19,7 @@ package v1
 import (
  "k8s.io/apimachinery/pkg/runtime"
  "k8s.io/apimachinery/pkg/runtime/schema"
+ utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 )
 
 // GroupName is the group name for this API.
@@ -53,13 +54,12 @@ func AddToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion)
  &GetOptions{},
  &DeleteOptions{},
  )
- scheme.AddConversionFuncs(
+ utilruntime.Must(scheme.AddConversionFuncs(
  Convert_versioned_Event_to_watch_Event,
  Convert_versioned_InternalEvent_to_versioned_Event,
  Convert_watch_Event_to_versioned_Event,
  Convert_versioned_Event_to_versioned_InternalEvent,
- )
-
+ ))
  // Register Unversioned types under their own special group
  scheme.AddUnversionedTypes(Unversioned,
  &Status{},
@@ -70,8 +70,8 @@ func AddToGroupVersion(scheme *runtime.Scheme, groupVersion schema.GroupVersion)
  )
 
  // register manually. This usually goes through the SchemeBuilder, which we cannot use here.
- AddConversionFuncs(scheme)
- RegisterDefaults(scheme)
+ utilruntime.Must(AddConversionFuncs(scheme))
+ utilruntime.Must(RegisterDefaults(scheme))
 }
 
 // scheme is the registry for the common types that adhere to the meta v1 API spec.
@@ -89,5 +89,5 @@ func init() {
  )
 
  // register manually. This usually goes through the SchemeBuilder, which we cannot use here.
- RegisterDefaults(scheme)
+ utilruntime.Must(RegisterDefaults(scheme))
 }

staging/src/k8s.io/apimachinery/pkg/runtime/BUILD

@@ -27,6 +27,7 @@ go_test(
  "//staging/src/k8s.io/apimachinery/pkg/runtime/testing:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
  "//staging/src/k8s.io/apimachinery/pkg/util/json:go_default_library",
+ "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
  "//vendor/github.com/stretchr/testify/assert:go_default_library",
  "//vendor/github.com/stretchr/testify/require:go_default_library",
  ],