kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13187 from jiahuif-forks/feature/enable-leader-election 

Always enable Leader Election for cloud-controller-manager
This commit is contained in:
Kubernetes Prow Robot 2022-02-05 06:30:50 -08:00 committed by GitHub
parent 214aa044ed a0fe9ee638
commit 70f3a2ec7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/components/awscloudcontrollermanager.go
View File

@ -49,6 +49,10 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
return nil return nil
} }
// No significant downside to always doing a leader election.
// Also, having multiple control plane nodes requires leader election.
eccm.LeaderElection = &kops.LeaderElectionConfiguration{LeaderElect: fi.Bool(true)}
eccm.ClusterName = b.ClusterName eccm.ClusterName = b.ClusterName
eccm.ClusterCIDR = clusterSpec.NonMasqueradeCIDR eccm.ClusterCIDR = clusterSpec.NonMasqueradeCIDR

5
pkg/model/components/gcpcloudcontrollermanager.go
View File

@ -45,6 +45,11 @@ func (b *GCPCloudControllerManagerOptionsBuilder) BuildOptions(options interface
if ccmConfig == nil { if ccmConfig == nil {
return nil return nil
} }
// No significant downside to always doing a leader election.
// Also, having multiple control plane nodes requires leader election.
ccmConfig.LeaderElection = &kops.LeaderElectionConfiguration{LeaderElect: fi.Bool(true)}
// CCM interacts directly with the GCP API, use the name safe for GCP // CCM interacts directly with the GCP API, use the name safe for GCP
ccmConfig.ClusterName = gce.SafeClusterName(b.ClusterName) ccmConfig.ClusterName = gce.SafeClusterName(b.ClusterName)
ccmConfig.AllocateNodeCIDRs = fi.Bool(true) ccmConfig.AllocateNodeCIDRs = fi.Bool(true)

2
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -25,6 +25,8 @@ spec:
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0
leaderElection:
leaderElect: true
cloudProvider: aws cloudProvider: aws
clusterAutoscaler: clusterAutoscaler:
awsUseStaticInstanceList: false awsUseStaticInstanceList: false

2
tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -23,6 +23,8 @@ spec:
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0 image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0
leaderElection:
leaderElect: true
cloudProvider: aws cloudProvider: aws
clusterAutoscaler: clusterAutoscaler:
awsUseStaticInstanceList: false awsUseStaticInstanceList: false

2
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -25,6 +25,8 @@ spec:
clusterName: minimal.example.com clusterName: minimal.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0
leaderElection:
leaderElect: true
cloudProvider: aws cloudProvider: aws
clusterAutoscaler: clusterAutoscaler:
awsUseStaticInstanceList: false awsUseStaticInstanceList: false

2
tests/integration/update_cluster/minimal-1.24/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -21,6 +21,8 @@ spec:
configureCloudRoutes: false configureCloudRoutes: false
enableLeaderMigration: true enableLeaderMigration: true
image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest
leaderElection:
leaderElect: true
cloudProvider: aws cloudProvider: aws
clusterDNSDomain: cluster.local clusterDNSDomain: cluster.local
configBase: memfs://tests/minimal.example.com configBase: memfs://tests/minimal.example.com

2
tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -25,6 +25,8 @@ spec:
clusterName: minimal-ipv6.example.com clusterName: minimal-ipv6.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0
leaderElection:
leaderElect: true
cloudProvider: aws cloudProvider: aws
clusterDNSDomain: cluster.local clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-ipv6.example.com configBase: memfs://clusters.example.com/minimal-ipv6.example.com

2
tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -25,6 +25,8 @@ spec:
clusterName: minimal-ipv6.example.com clusterName: minimal-ipv6.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0
leaderElection:
leaderElect: true
cloudProvider: aws cloudProvider: aws
clusterDNSDomain: cluster.local clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-ipv6.example.com configBase: memfs://clusters.example.com/minimal-ipv6.example.com

2
tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -25,6 +25,8 @@ spec:
clusterName: minimal-ipv6.example.com clusterName: minimal-ipv6.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0 image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0
leaderElection:
leaderElect: true
cloudProvider: aws cloudProvider: aws
clusterDNSDomain: cluster.local clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-ipv6.example.com configBase: memfs://clusters.example.com/minimal-ipv6.example.com

2
tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -25,6 +25,8 @@ spec:
clusterName: minimal-ipv6.example.com clusterName: minimal-ipv6.example.com
configureCloudRoutes: false configureCloudRoutes: false
image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0 image: k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0
leaderElection:
leaderElect: true
cloudProvider: aws cloudProvider: aws
clusterDNSDomain: cluster.local clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/minimal-ipv6.example.com configBase: memfs://clusters.example.com/minimal-ipv6.example.com