Skip to content

Bug 2032926: feat: library-go bump and leader election config #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 5 commits into from
Dec 21, 2021
Merged

Bug 2032926: feat: library-go bump and leader election config #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a01f26
feat: library-go bump
eggfoobar Dec 16, 2021
5c19d58
feat: updated leader election code
eggfoobar Dec 16, 2021
b8e5afc
fix: cloud platform tests
eggfoobar Dec 17, 2021
8fff6e8
bump: library-go
eggfoobar Dec 17, 2021
e7c2f14
upkeep: update and comment
eggfoobar Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 14 additions & 9 deletions cmd/cluster-cloud-controller-manager-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,8 @@ var (
setupLog = ctrl.Log.WithName("setup")

leaderElectionConfig = config.LeaderElectionConfiguration{
LeaderElect: true,
LeaseDuration: util.LeaseDuration,
RenewDeadline: util.RenewDeadline,
RetryPeriod: util.RetryPeriod,
ResourceName: "cluster-cloud-controller-manager-leader",
LeaderElect: true,
ResourceName: "cluster-cloud-controller-manager-leader",
}
)

Expand Down Expand Up @@ -107,8 +104,16 @@ func main() {

ctrl.SetLogger(klogr.New().WithName("CCMOperator"))

restConfig := ctrl.GetConfigOrDie()
le := util.GetLeaderElectionDefaults(restConfig, configv1.LeaderElection{
Disable: !leaderElectionConfig.LeaderElect,
RenewDeadline: leaderElectionConfig.RenewDeadline,
RetryPeriod: leaderElectionConfig.RetryPeriod,
LeaseDuration: leaderElectionConfig.LeaseDuration,
})

syncPeriod := 10 * time.Minute
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
Namespace: *managedNamespace,
Scheme: scheme,
SyncPeriod: &syncPeriod,
Expand All @@ -117,10 +122,10 @@ func main() {
HealthProbeBindAddress: *healthAddr,
LeaderElectionNamespace: leaderElectionConfig.ResourceNamespace,
LeaderElection: leaderElectionConfig.LeaderElect,
LeaseDuration: &leaderElectionConfig.LeaseDuration.Duration,
LeaderElectionID: leaderElectionConfig.ResourceName,
RetryPeriod: &leaderElectionConfig.RetryPeriod.Duration,
RenewDeadline: &leaderElectionConfig.RenewDeadline.Duration,
LeaseDuration: &le.LeaseDuration.Duration,
RetryPeriod: &le.RetryPeriod.Duration,
RenewDeadline: &le.RenewDeadline.Duration,
})
if err != nil {
setupLog.Error(err, "unable to start manager")
Expand Down
23 changes: 14 additions & 9 deletions cmd/config-sync-controllers/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,8 @@ var (
setupLog = ctrl.Log.WithName("setup")

leaderElectionConfig = config.LeaderElectionConfiguration{
LeaderElect: true,
LeaseDuration: util.LeaseDuration,
RenewDeadline: util.RenewDeadline,
RetryPeriod: util.RetryPeriod,
ResourceName: "cluster-cloud-config-sync-leader",
LeaderElect: true,
ResourceName: "cluster-cloud-config-sync-leader",
}
)

Expand Down Expand Up @@ -94,22 +91,30 @@ func main() {

ctrl.SetLogger(klogr.New().WithName("CCCMOConfigSyncControllers"))

restConfig := ctrl.GetConfigOrDie()
le := util.GetLeaderElectionDefaults(restConfig, configv1.LeaderElection{
Disable: !leaderElectionConfig.LeaderElect,
RenewDeadline: leaderElectionConfig.RenewDeadline,
RetryPeriod: leaderElectionConfig.RetryPeriod,
LeaseDuration: leaderElectionConfig.LeaseDuration,
})

syncPeriod := 10 * time.Minute
cacheBuilder := cache.MultiNamespacedCacheBuilder([]string{
*managedNamespace, controllers.OpenshiftConfigNamespace, controllers.OpenshiftManagedConfigNamespace,
})
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
Namespace: *managedNamespace,
Scheme: scheme,
SyncPeriod: &syncPeriod,
MetricsBindAddress: *metricsAddr,
HealthProbeBindAddress: *healthAddr,
LeaderElectionNamespace: leaderElectionConfig.ResourceNamespace,
LeaderElection: leaderElectionConfig.LeaderElect,
LeaseDuration: &leaderElectionConfig.LeaseDuration.Duration,
LeaderElectionID: leaderElectionConfig.ResourceName,
RetryPeriod: &leaderElectionConfig.RetryPeriod.Duration,
RenewDeadline: &leaderElectionConfig.RenewDeadline.Duration,
LeaseDuration: &le.LeaseDuration.Duration,
RetryPeriod: &le.RetryPeriod.Duration,
RenewDeadline: &le.RenewDeadline.Duration,
NewCache: cacheBuilder,
})
if err != nil {
Expand Down
33 changes: 15 additions & 18 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,23 @@ go 1.16

require (
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
github.com/go-logr/logr v1.0.0
github.com/go-logr/logr v1.2.0
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.14.0
github.com/openshift/api v0.0.0-20210924154557-a4f696157341
github.com/openshift/library-go v0.0.0-20211103140146-29c9bb8362e2
github.com/spf13/cobra v1.1.3
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.17.0
github.com/openshift/api v0.0.0-20211209135129-c58d9f695577
github.com/openshift/library-go v0.0.0-20211220195323-eca2c467c492
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
golang.org/x/net v0.0.0-20210716203947-853a461950ff // indirect
k8s.io/api v0.22.1
k8s.io/apiextensions-apiserver v0.22.1
k8s.io/apimachinery v0.22.1
k8s.io/client-go v0.22.1
k8s.io/component-base v0.22.1
k8s.io/klog/v2 v2.10.0
k8s.io/utils v0.0.0-20210802155522-efc7438f0176
sigs.k8s.io/controller-runtime v0.9.6
sigs.k8s.io/yaml v1.2.0
k8s.io/api v0.23.0
k8s.io/apiextensions-apiserver v0.23.0
k8s.io/apimachinery v0.23.0
k8s.io/client-go v0.23.0
k8s.io/component-base v0.23.0
k8s.io/klog/v2 v2.30.0
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
sigs.k8s.io/controller-runtime v0.11.0
sigs.k8s.io/yaml v1.3.0
)

replace github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
Loading