scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg/controlplane: update lease parameters into public variables so they can be set by integration tests

Browse Source 
Signed-off-by: Andrew Sy Kim <andrewsy@google.com>
This commit is contained in:
Andrew Sy Kim
2022-11-07 16:14:13 -05:00
parent 02020b20e7
commit d24f93e4a4
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/controlplane/instance.go
View File

@@ -121,12 +121,6 @@ const (
// 1. the lease is an identity lease (different from leader election leases) // 1. the lease is an identity lease (different from leader election leases)
// 2. which component owns this lease // 2. which component owns this lease
IdentityLeaseComponentLabelKey = "k8s.io/component" IdentityLeaseComponentLabelKey = "k8s.io/component"
// identityLeaseDurationSeconds is the duration of kube-apiserver lease in seconds
identityLeaseDurationSeconds = 3600
// identityLeaseRenewIntervalSeconds is the interval of kube-apiserver renewing its lease in seconds
identityLeaseRenewIntervalSeconds = 10
// identityLeaseGCPeriod is the interval which the lease GC controller checks for expired leases
identityLeaseGCPeriod = 3600 * time.Second
// KubeAPIServer defines variable used internally when referring to kube-apiserver component // KubeAPIServer defines variable used internally when referring to kube-apiserver component
KubeAPIServer = "kube-apiserver" KubeAPIServer = "kube-apiserver"
// KubeAPIServerIdentityLeaseLabelSelector selects kube-apiserver identity leases // KubeAPIServerIdentityLeaseLabelSelector selects kube-apiserver identity leases
@@ -135,6 +129,18 @@ const (
repairLoopInterval = 3 * time.Minute repairLoopInterval = 3 * time.Minute
) )
var (
// IdentityLeaseGCPeriod is the interval which the lease GC controller checks for expired leases
// IdentityLeaseGCPeriod is exposed so integration tests can tune this value.
IdentityLeaseGCPeriod = 3600 * time.Second
// IdentityLeaseDurationSeconds is the duration of kube-apiserver lease in seconds
// IdentityLeaseDurationSeconds is exposed so integration tests can tune this value.
IdentityLeaseDurationSeconds = 3600
// IdentityLeaseRenewIntervalSeconds is the interval of kube-apiserver renewing its lease in seconds
// IdentityLeaseRenewIntervalSeconds is exposed so integration tests can tune this value.
IdentityLeaseRenewIntervalPeriod = 10 * time.Second
)
// ExtraConfig defines extra configuration for the master // ExtraConfig defines extra configuration for the master
type ExtraConfig struct { type ExtraConfig struct {
ClusterAuthenticationInfo clusterauthenticationtrust.ClusterAuthenticationInfo ClusterAuthenticationInfo clusterauthenticationtrust.ClusterAuthenticationInfo
@@ -483,9 +489,9 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
clock.RealClock{}, clock.RealClock{},
kubeClient, kubeClient,
holderIdentity, holderIdentity,
identityLeaseDurationSeconds, int32(IdentityLeaseDurationSeconds),
nil, nil,
identityLeaseRenewIntervalSeconds*time.Second, IdentityLeaseRenewIntervalPeriod,
leaseName, leaseName,
metav1.NamespaceSystem, metav1.NamespaceSystem,
labelAPIServerHeartbeat) labelAPIServerHeartbeat)
@@ -499,7 +505,7 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
} }
go apiserverleasegc.NewAPIServerLeaseGC( go apiserverleasegc.NewAPIServerLeaseGC(
kubeClient, kubeClient,
identityLeaseGCPeriod, IdentityLeaseGCPeriod,
metav1.NamespaceSystem, metav1.NamespaceSystem,
KubeAPIServerIdentityLeaseLabelSelector, KubeAPIServerIdentityLeaseLabelSelector,
).Run(hookContext.StopCh) ).Run(hookContext.StopCh)