github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114586 from andrewsykim/apiserver-lease-rename

Browse Source 
Rename apiserver identity lease labels to apiserver.kubernetes.io/identity
This commit is contained in:
Kubernetes Prow Robot
2023-01-17 21:36:34 -08:00
committed by GitHub
parent 106332252b 4c74fc0a65
commit 46f3821bf4
8 changed files with 162 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/storageversiongc/gc_controller_test.go
View File

@@ -48,7 +48,7 @@ func newKubeApiserverLease(name, holderIdentity string) *coordinationv1.Lease {
Name: name,
Namespace: metav1.NamespaceSystem,
Labels: map[string]string{
"k8s.io/component": "kube-apiserver",
"apiserver.kubernetes.io/identity": "kube-apiserver",
},
},
Spec: coordinationv1.LeaseSpec{

12
pkg/controlplane/controller/apiserverleasegc/gc_controller_test.go
View File

@@ -44,7 +44,7 @@ func Test_Controller(t *testing.T) {
Name: "kube-apiserver-12345",
Namespace: metav1.NamespaceSystem,
Labels: map[string]string{
"k8s.io/component": "kube-apiserver",
"apiserver.kubernetes.io/identity": "kube-apiserver",
},
},
Spec: coordinationv1.LeaseSpec{
@@ -62,7 +62,7 @@ func Test_Controller(t *testing.T) {
Name: "kube-apiserver-12345",
Namespace: metav1.NamespaceSystem,
Labels: map[string]string{
"k8s.io/component": "kube-controller-manager",
"apiserver.kubernetes.io/identity": "kube-controller-manager",
},
},
Spec: coordinationv1.LeaseSpec{
@@ -80,7 +80,7 @@ func Test_Controller(t *testing.T) {
Name: "kube-apiserver-12345",
Namespace: metav1.NamespaceSystem,
Labels: map[string]string{
"k8s.io/component": "kube-apiserver",
"apiserver.kubernetes.io/identity": "kube-apiserver",
},
},
Spec: coordinationv1.LeaseSpec{
@@ -98,7 +98,7 @@ func Test_Controller(t *testing.T) {
Name: "kube-apiserver-12345",
Namespace: metav1.NamespaceSystem,
Labels: map[string]string{
"k8s.io/component": "kube-apiserver",
"apiserver.kubernetes.io/identity": "kube-apiserver",
},
},
Spec: coordinationv1.LeaseSpec{
@@ -116,7 +116,7 @@ func Test_Controller(t *testing.T) {
Name: "kube-apiserver-12345",
Namespace: metav1.NamespaceSystem,
Labels: map[string]string{
"k8s.io/component": "kube-apiserver",
"apiserver.kubernetes.io/identity": "kube-apiserver",
},
},
Spec: coordinationv1.LeaseSpec{
@@ -132,7 +132,7 @@ func Test_Controller(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
clientset := fake.NewSimpleClientset(test.lease)
controller := NewAPIServerLeaseGC(clientset, 100*time.Millisecond, metav1.NamespaceSystem, "k8s.io/component=kube-apiserver")
controller := NewAPIServerLeaseGC(clientset, 100*time.Millisecond, metav1.NamespaceSystem, "apiserver.kubernetes.io/identity=kube-apiserver")
go controller.Run(nil)
time.Sleep(time.Second)

53
pkg/controlplane/instance.go
View File

@@ -123,9 +123,11 @@ const (
// IdentityLeaseComponentLabelKey is used to apply a component label to identity lease objects, indicating:
// 1. the lease is an identity lease (different from leader election leases)
// 2. which component owns this lease
IdentityLeaseComponentLabelKey = "k8s.io/component"
IdentityLeaseComponentLabelKey = "apiserver.kubernetes.io/identity"
// KubeAPIServer defines variable used internally when referring to kube-apiserver component
KubeAPIServer = "kube-apiserver"
// DeprecatedKubeAPIServerIdentityLeaseLabelSelector selects kube-apiserver identity leases
DeprecatedKubeAPIServerIdentityLeaseLabelSelector = "k8s.io/component=kube-apiserver"
// KubeAPIServerIdentityLeaseLabelSelector selects kube-apiserver identity leases
KubeAPIServerIdentityLeaseLabelSelector = IdentityLeaseComponentLabelKey + "=" + KubeAPIServer
// repairLoopInterval defines the interval used to run the Services ClusterIP and NodePort repair loops
@@ -505,10 +507,28 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
IdentityLeaseRenewIntervalPeriod,
leaseName,
metav1.NamespaceSystem,
labelAPIServerHeartbeat)
// TODO: receive identity label value as a parameter when post start hook is moved to generic apiserver.
labelAPIServerHeartbeatFunc(KubeAPIServer))
go controller.Run(hookContext.StopCh)
return nil
})
// Labels for apiserver idenitiy leases switched from k8s.io/component=kube-apiserver to apiserver.kubernetes.io/identity=kube-apiserver.
// For compatibility, garbage collect leases with both labels for at least 1 release
// TODO: remove in Kubernetes 1.28
m.GenericAPIServer.AddPostStartHookOrDie("start-deprecated-kube-apiserver-identity-lease-garbage-collector", func(hookContext genericapiserver.PostStartHookContext) error {
kubeClient, err := kubernetes.NewForConfig(hookContext.LoopbackClientConfig)
if err != nil {
return err
}
go apiserverleasegc.NewAPIServerLeaseGC(
kubeClient,
IdentityLeaseGCPeriod,
metav1.NamespaceSystem,
DeprecatedKubeAPIServerIdentityLeaseLabelSelector,
).Run(hookContext.StopCh)
return nil
})
// TODO: move this into generic apiserver and make the lease identity value configurable
m.GenericAPIServer.AddPostStartHookOrDie("start-kube-apiserver-identity-lease-garbage-collector", func(hookContext genericapiserver.PostStartHookContext) error {
kubeClient, err := kubernetes.NewForConfig(hookContext.LoopbackClientConfig)
if err != nil {
@@ -536,21 +556,24 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
return m, nil
}
func labelAPIServerHeartbeat(lease *coordinationapiv1.Lease) error {
if lease.Labels == nil {
lease.Labels = map[string]string{}
}
// This label indicates that kube-apiserver owns this identity lease object
lease.Labels[IdentityLeaseComponentLabelKey] = KubeAPIServer
func labelAPIServerHeartbeatFunc(identity string) lease.ProcessLeaseFunc {
return func(lease *coordinationapiv1.Lease) error {
if lease.Labels == nil {
lease.Labels = map[string]string{}
}
hostname, err := os.Hostname()
if err != nil {
return err
}
// This label indiciates the identity of the lease object.
lease.Labels[IdentityLeaseComponentLabelKey] = identity
// convenience label to easily map a lease object to a specific apiserver
lease.Labels[apiv1.LabelHostname] = hostname
return nil
hostname, err := os.Hostname()
if err != nil {
return err
}
// convenience label to easily map a lease object to a specific apiserver
lease.Labels[apiv1.LabelHostname] = hostname
return nil
}
}
// InstallLegacyAPI will install the legacy APIs for the restStorageProviders if they are enabled.