github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-28 07:57:20 +00:00
Code Issues Projects Releases Wiki Activity

Add missing error handling in schema-related code

Browse Source 
Kubernetes-commit: bfe313d5f351dfae086a85a97e7103183173e5b5
This commit is contained in:
Mikhail Mazurskiy 2018-06-03 14:59:58 +10:00 committed by Kubernetes Publisher
parent 82b3a57536
commit b045806917
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/pkg/client/auth/exec/exec.go
View File

@ -36,6 +36,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/pkg/apis/clientauthentication" "k8s.io/client-go/pkg/apis/clientauthentication"
"k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1" "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1"
"k8s.io/client-go/pkg/apis/clientauthentication/v1beta1" "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1"
@ -51,9 +52,9 @@ var codecs = serializer.NewCodecFactory(scheme)
func init() { func init() {
v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
v1alpha1.AddToScheme(scheme) utilruntime.Must(v1alpha1.AddToScheme(scheme))
v1beta1.AddToScheme(scheme) utilruntime.Must(v1beta1.AddToScheme(scheme))
clientauthentication.AddToScheme(scheme) utilruntime.Must(clientauthentication.AddToScheme(scheme))
} }
var ( var (

15
scale/util.go
View File

@ -25,6 +25,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer" serializer "k8s.io/apimachinery/pkg/runtime/serializer"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/discovery" "k8s.io/client-go/discovery"
scalescheme "k8s.io/client-go/scale/scheme" scalescheme "k8s.io/client-go/scale/scheme"
scaleappsint "k8s.io/client-go/scale/scheme/appsint" scaleappsint "k8s.io/client-go/scale/scheme/appsint"
@ -143,13 +144,13 @@ type ScaleConverter struct {
// Scales in autoscaling/v1 and extensions/v1beta1. // Scales in autoscaling/v1 and extensions/v1beta1.
func NewScaleConverter() *ScaleConverter { func NewScaleConverter() *ScaleConverter {
scheme := runtime.NewScheme() scheme := runtime.NewScheme()
scaleautoscaling.AddToScheme(scheme) utilruntime.Must(scaleautoscaling.AddToScheme(scheme))
scalescheme.AddToScheme(scheme) utilruntime.Must(scalescheme.AddToScheme(scheme))
scaleext.AddToScheme(scheme) utilruntime.Must(scaleext.AddToScheme(scheme))
scaleextint.AddToScheme(scheme) utilruntime.Must(scaleextint.AddToScheme(scheme))
scaleappsint.AddToScheme(scheme) utilruntime.Must(scaleappsint.AddToScheme(scheme))
scaleappsv1beta1.AddToScheme(scheme) utilruntime.Must(scaleappsv1beta1.AddToScheme(scheme))
scaleappsv1beta2.AddToScheme(scheme) utilruntime.Must(scaleappsv1beta2.AddToScheme(scheme))
return &ScaleConverter{ return &ScaleConverter{
scheme: scheme, scheme: scheme,

11
tools/clientcmd/api/latest/latest.go
View File

@ -21,6 +21,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/apimachinery/pkg/runtime/serializer/json"
"k8s.io/apimachinery/pkg/runtime/serializer/versioning" "k8s.io/apimachinery/pkg/runtime/serializer/versioning"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/client-go/tools/clientcmd/api/v1" "k8s.io/client-go/tools/clientcmd/api/v1"
) )
@ -47,14 +48,8 @@ var (
func init() { func init() {
Scheme = runtime.NewScheme() Scheme = runtime.NewScheme()
if err := api.AddToScheme(Scheme); err != nil { utilruntime.Must(api.AddToScheme(Scheme))
// Programmer error, detect immediately utilruntime.Must(v1.AddToScheme(Scheme))
panic(err)
}
if err := v1.AddToScheme(Scheme); err != nil {
// Programmer error, detect immediately
panic(err)
}
yamlSerializer := json.NewYAMLSerializer(json.DefaultMetaFactory, Scheme, Scheme) yamlSerializer := json.NewYAMLSerializer(json.DefaultMetaFactory, Scheme, Scheme)
Codec = versioning.NewDefaultingCodecForScheme( Codec = versioning.NewDefaultingCodecForScheme(
Scheme, Scheme,