Merge pull request kubernetes-sigs#2466 from troy0820/troy0820/16-add-types-to-leader-election

[release-0.16] 🐛 Add corev1, coordinationv1 scheme for leader election when LeaderElection manager option is true

Author: k8s-ci-robot

pkg/manager/manager.go

@@ -26,6 +26,8 @@ import (
 "time"
 
 "github.com/go-logr/logr"
+coordinationv1 "k8s.io/api/coordination/v1"
+corev1 "k8s.io/api/core/v1"
 "k8s.io/apimachinery/pkg/api/meta"
 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 "k8s.io/apimachinery/pkg/runtime"
@@ -353,7 +355,16 @@ func New(config *rest.Config, options Options) (Manager, error) {
 leaderRecorderProvider = recorderProvider
 } else {
 leaderConfig = rest.CopyConfig(options.LeaderElectionConfig)
-leaderRecorderProvider, err = options.newRecorderProvider(leaderConfig, cluster.GetHTTPClient(), cluster.GetScheme(), options.Logger.WithName("events"), options.makeBroadcaster)
+scheme := cluster.GetScheme()
+err := corev1.AddToScheme(scheme)
+if err != nil {
+return nil, err
+}
+err = coordinationv1.AddToScheme(scheme)
+if err != nil {
+return nil, err
+}
+leaderRecorderProvider, err = options.newRecorderProvider(leaderConfig, cluster.GetHTTPClient(), scheme, options.Logger.WithName("events"), options.makeBroadcaster)
 if err != nil {
 return nil, err
 }
@@ -396,7 +407,6 @@ func New(config *rest.Config, options Options) (Manager, error) {
 
 errChan := make(chan error)
 runnables := newRunnables(options.BaseContext, errChan)
-
 return &controllerManager{
 stopProcedureEngaged: pointer.Int64(0),
 cluster: cluster,

pkg/manager/manager_test.go

@@ -34,10 +34,12 @@ import (
 . "github.com/onsi/gomega"
 "github.com/prometheus/client_golang/prometheus"
 "go.uber.org/goleak"
+coordinationv1 "k8s.io/api/coordination/v1"
 corev1 "k8s.io/api/core/v1"
 "k8s.io/apimachinery/pkg/api/meta"
 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 "k8s.io/apimachinery/pkg/runtime"
+"k8s.io/apimachinery/pkg/runtime/schema"
 "k8s.io/client-go/rest"
 "k8s.io/client-go/tools/leaderelection/resourcelock"
 configv1alpha1 "k8s.io/component-base/config/v1alpha1"
@@ -308,7 +310,10 @@ var _ = Describe("manger.Manager", func() {
 PprofBindAddress: "0",
 })
 Expect(err).ToNot(HaveOccurred())
-
+gvkcorev1 := schema.GroupVersionKind{Group: corev1.SchemeGroupVersion.Group, Version: corev1.SchemeGroupVersion.Version, Kind: "ConfigMap"}
+gvkcoordinationv1 := schema.GroupVersionKind{Group: coordinationv1.SchemeGroupVersion.Group, Version: coordinationv1.SchemeGroupVersion.Version, Kind: "Lease"}
+Expect(m.GetScheme().Recognizes(gvkcorev1)).To(BeTrue())
+Expect(m.GetScheme().Recognizes(gvkcoordinationv1)).To(BeTrue())
 runnableDone := make(chan struct{})
 slowRunnable := RunnableFunc(func(ctx context.Context) error {
 <-ctx.Done()