mirror of https://github.com/k3s-io/k3s
Handle errors
parent
d43e1b3032
commit
5cab7f9a57
|
@ -135,7 +135,9 @@ func TestMarshalUnmarshalToYamlForCodecs(t *testing.T) {
|
||||||
|
|
||||||
kubeadmapiv1alpha3.SetDefaults_InitConfiguration(cfg)
|
kubeadmapiv1alpha3.SetDefaults_InitConfiguration(cfg)
|
||||||
scheme := runtime.NewScheme()
|
scheme := runtime.NewScheme()
|
||||||
kubeadmapiv1alpha3.AddToScheme(scheme)
|
if err := kubeadmapiv1alpha3.AddToScheme(scheme); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
codecs := serializer.NewCodecFactory(scheme)
|
codecs := serializer.NewCodecFactory(scheme)
|
||||||
|
|
||||||
bytes, err := MarshalToYamlForCodecs(cfg, kubeadmapiv1alpha3.SchemeGroupVersion, codecs)
|
bytes, err := MarshalToYamlForCodecs(cfg, kubeadmapiv1alpha3.SchemeGroupVersion, codecs)
|
||||||
|
|
|
@ -57,7 +57,7 @@ import (
|
||||||
func init() {
|
func init() {
|
||||||
// Register external types for Scheme
|
// Register external types for Scheme
|
||||||
metav1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
|
metav1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
|
||||||
scheme.AddToScheme(Scheme)
|
utilruntime.Must(scheme.AddToScheme(Scheme))
|
||||||
|
|
||||||
utilruntime.Must(Scheme.SetVersionPriority(corev1.SchemeGroupVersion))
|
utilruntime.Must(Scheme.SetVersionPriority(corev1.SchemeGroupVersion))
|
||||||
utilruntime.Must(Scheme.SetVersionPriority(admissionv1alpha1.SchemeGroupVersion))
|
utilruntime.Must(Scheme.SetVersionPriority(admissionv1alpha1.SchemeGroupVersion))
|
||||||
|
|
|
@ -170,8 +170,8 @@ func newFakeScheme(t *testing.T) *runtime.Scheme {
|
||||||
require.NoError(t, apiv1.AddToScheme(ret))
|
require.NoError(t, apiv1.AddToScheme(ret))
|
||||||
require.NoError(t, extensionsapiv1beta1.AddToScheme(ret))
|
require.NoError(t, extensionsapiv1beta1.AddToScheme(ret))
|
||||||
|
|
||||||
ret.SetVersionPriority(apiv1.SchemeGroupVersion)
|
require.NoError(t, ret.SetVersionPriority(apiv1.SchemeGroupVersion))
|
||||||
ret.SetVersionPriority(extensionsapiv1beta1.SchemeGroupVersion)
|
require.NoError(t, ret.SetVersionPriority(extensionsapiv1beta1.SchemeGroupVersion))
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,6 @@ go_library(
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_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/schema:go_default_library",
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/util/cache:go_default_library",
|
"//staging/src/k8s.io/apimachinery/pkg/util/cache:go_default_library",
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
|
|
||||||
"//staging/src/k8s.io/apiserver/pkg/authentication/authenticator:go_default_library",
|
"//staging/src/k8s.io/apiserver/pkg/authentication/authenticator:go_default_library",
|
||||||
"//staging/src/k8s.io/apiserver/pkg/authentication/user:go_default_library",
|
"//staging/src/k8s.io/apiserver/pkg/authentication/user:go_default_library",
|
||||||
"//staging/src/k8s.io/apiserver/pkg/util/webhook:go_default_library",
|
"//staging/src/k8s.io/apiserver/pkg/util/webhook:go_default_library",
|
||||||
|
|
|
@ -26,7 +26,6 @@ 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/util/cache"
|
"k8s.io/apimachinery/pkg/util/cache"
|
||||||
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
|
||||||
"k8s.io/apiserver/pkg/authentication/authenticator"
|
"k8s.io/apiserver/pkg/authentication/authenticator"
|
||||||
"k8s.io/apiserver/pkg/authentication/user"
|
"k8s.io/apiserver/pkg/authentication/user"
|
||||||
"k8s.io/apiserver/pkg/util/webhook"
|
"k8s.io/apiserver/pkg/util/webhook"
|
||||||
|
@ -118,8 +117,12 @@ func (w *WebhookTokenAuthenticator) AuthenticateToken(token string) (user.Info,
|
||||||
// requests to the exact path specified in the kubeconfig file, so arbitrary non-API servers can be targeted.
|
// requests to the exact path specified in the kubeconfig file, so arbitrary non-API servers can be targeted.
|
||||||
func tokenReviewInterfaceFromKubeconfig(kubeConfigFile string) (authenticationclient.TokenReviewInterface, error) {
|
func tokenReviewInterfaceFromKubeconfig(kubeConfigFile string) (authenticationclient.TokenReviewInterface, error) {
|
||||||
localScheme := runtime.NewScheme()
|
localScheme := runtime.NewScheme()
|
||||||
scheme.AddToScheme(localScheme)
|
if err := scheme.AddToScheme(localScheme); err != nil {
|
||||||
utilruntime.Must(localScheme.SetVersionPriority(groupVersions...))
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := localScheme.SetVersionPriority(groupVersions...); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
gw, err := webhook.NewGenericWebhook(localScheme, scheme.Codecs, kubeConfigFile, groupVersions, 0)
|
gw, err := webhook.NewGenericWebhook(localScheme, scheme.Codecs, kubeConfigFile, groupVersions, 0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -239,8 +239,12 @@ func convertToSARExtra(extra map[string][]string) map[string]authorization.Extra
|
||||||
// requests to the exact path specified in the kubeconfig file, so arbitrary non-API servers can be targeted.
|
// requests to the exact path specified in the kubeconfig file, so arbitrary non-API servers can be targeted.
|
||||||
func subjectAccessReviewInterfaceFromKubeconfig(kubeConfigFile string) (authorizationclient.SubjectAccessReviewInterface, error) {
|
func subjectAccessReviewInterfaceFromKubeconfig(kubeConfigFile string) (authorizationclient.SubjectAccessReviewInterface, error) {
|
||||||
localScheme := runtime.NewScheme()
|
localScheme := runtime.NewScheme()
|
||||||
scheme.AddToScheme(localScheme)
|
if err := scheme.AddToScheme(localScheme); err != nil {
|
||||||
localScheme.SetVersionPriority(groupVersions...)
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := localScheme.SetVersionPriority(groupVersions...); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
gw, err := webhook.NewGenericWebhook(localScheme, scheme.Codecs, kubeConfigFile, groupVersions, 0)
|
gw, err := webhook.NewGenericWebhook(localScheme, scheme.Codecs, kubeConfigFile, groupVersions, 0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -27,6 +27,7 @@ import (
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||||
"k8s.io/apimachinery/pkg/util/runtime"
|
"k8s.io/apimachinery/pkg/util/runtime"
|
||||||
|
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
appsinformers "k8s.io/client-go/informers/apps/v1"
|
appsinformers "k8s.io/client-go/informers/apps/v1"
|
||||||
"k8s.io/client-go/kubernetes"
|
"k8s.io/client-go/kubernetes"
|
||||||
|
@ -94,7 +95,7 @@ func NewController(
|
||||||
// Create event broadcaster
|
// Create event broadcaster
|
||||||
// Add sample-controller types to the default Kubernetes Scheme so Events can be
|
// Add sample-controller types to the default Kubernetes Scheme so Events can be
|
||||||
// logged for sample-controller types.
|
// logged for sample-controller types.
|
||||||
samplescheme.AddToScheme(scheme.Scheme)
|
utilruntime.Must(samplescheme.AddToScheme(scheme.Scheme))
|
||||||
glog.V(4).Info("Creating event broadcaster")
|
glog.V(4).Info("Creating event broadcaster")
|
||||||
eventBroadcaster := record.NewBroadcaster()
|
eventBroadcaster := record.NewBroadcaster()
|
||||||
eventBroadcaster.StartLogging(glog.Infof)
|
eventBroadcaster.StartLogging(glog.Infof)
|
||||||
|
|
Loading…
Reference in New Issue