Skip to content

Commit b045806

Browse files
ash2kk8s-publishing-bot
authored andcommitted
Add missing error handling in schema-related code
Kubernetes-commit: bfe313d5f351dfae086a85a97e7103183173e5b5
1 parent 82b3a57 commit b045806

File tree

3 files changed

+15
-18
lines changed

3 files changed

+15
-18
lines changed

plugin/pkg/client/auth/exec/exec.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"k8s.io/apimachinery/pkg/runtime"
3737
"k8s.io/apimachinery/pkg/runtime/schema"
3838
"k8s.io/apimachinery/pkg/runtime/serializer"
39+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3940
"k8s.io/client-go/pkg/apis/clientauthentication"
4041
"k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1"
4142
"k8s.io/client-go/pkg/apis/clientauthentication/v1beta1"
@@ -51,9 +52,9 @@ var codecs = serializer.NewCodecFactory(scheme)
5152

5253
func init() {
5354
v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
54-
v1alpha1.AddToScheme(scheme)
55-
v1beta1.AddToScheme(scheme)
56-
clientauthentication.AddToScheme(scheme)
55+
utilruntime.Must(v1alpha1.AddToScheme(scheme))
56+
utilruntime.Must(v1beta1.AddToScheme(scheme))
57+
utilruntime.Must(clientauthentication.AddToScheme(scheme))
5758
}
5859

5960
var (

scale/util.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"k8s.io/apimachinery/pkg/runtime"
2626
"k8s.io/apimachinery/pkg/runtime/schema"
2727
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
28+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2829
"k8s.io/client-go/discovery"
2930
scalescheme "k8s.io/client-go/scale/scheme"
3031
scaleappsint "k8s.io/client-go/scale/scheme/appsint"
@@ -143,13 +144,13 @@ type ScaleConverter struct {
143144
// Scales in autoscaling/v1 and extensions/v1beta1.
144145
func NewScaleConverter() *ScaleConverter {
145146
scheme := runtime.NewScheme()
146-
scaleautoscaling.AddToScheme(scheme)
147-
scalescheme.AddToScheme(scheme)
148-
scaleext.AddToScheme(scheme)
149-
scaleextint.AddToScheme(scheme)
150-
scaleappsint.AddToScheme(scheme)
151-
scaleappsv1beta1.AddToScheme(scheme)
152-
scaleappsv1beta2.AddToScheme(scheme)
147+
utilruntime.Must(scaleautoscaling.AddToScheme(scheme))
148+
utilruntime.Must(scalescheme.AddToScheme(scheme))
149+
utilruntime.Must(scaleext.AddToScheme(scheme))
150+
utilruntime.Must(scaleextint.AddToScheme(scheme))
151+
utilruntime.Must(scaleappsint.AddToScheme(scheme))
152+
utilruntime.Must(scaleappsv1beta1.AddToScheme(scheme))
153+
utilruntime.Must(scaleappsv1beta2.AddToScheme(scheme))
153154

154155
return &ScaleConverter{
155156
scheme: scheme,

tools/clientcmd/api/latest/latest.go

+3-8
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"k8s.io/apimachinery/pkg/runtime/schema"
2222
"k8s.io/apimachinery/pkg/runtime/serializer/json"
2323
"k8s.io/apimachinery/pkg/runtime/serializer/versioning"
24+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2425
"k8s.io/client-go/tools/clientcmd/api"
2526
"k8s.io/client-go/tools/clientcmd/api/v1"
2627
)
@@ -47,14 +48,8 @@ var (
4748

4849
func init() {
4950
Scheme = runtime.NewScheme()
50-
if err := api.AddToScheme(Scheme); err != nil {
51-
// Programmer error, detect immediately
52-
panic(err)
53-
}
54-
if err := v1.AddToScheme(Scheme); err != nil {
55-
// Programmer error, detect immediately
56-
panic(err)
57-
}
51+
utilruntime.Must(api.AddToScheme(Scheme))
52+
utilruntime.Must(v1.AddToScheme(Scheme))
5853
yamlSerializer := json.NewYAMLSerializer(json.DefaultMetaFactory, Scheme, Scheme)
5954
Codec = versioning.NewDefaultingCodecForScheme(
6055
Scheme,

0 commit comments

Comments
 (0)