UPSTREAM: <carry>: emit event when readyz goes true

OpenShift-Rebase-Source: 6386eb2
openshift · Jul 1, 2024 · c3a54b2 · c3a54b2
1 parent 6d5aa04
commit c3a54b2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/pkg/controlplane/apiserver/server.go b/pkg/controlplane/apiserver/server.go
@@ -21,6 +21,8 @@ import (
 	"os"
 	"time"
 
+	"k8s.io/kubernetes/pkg/controlplane/controller/kubernetesservice"
+
 	coordinationapiv1 "k8s.io/api/coordination/v1"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -130,6 +132,8 @@ func (c completedConfig) New(name string, delegationTarget genericapiserver.Dele
 		VersionedInformers:        c.VersionedInformers,
 	}
 
+	kubernetesservice.KubeAPIServerEmitEventFn = s.GenericAPIServer.Eventf
+
 	client, err := kubernetes.NewForConfig(s.GenericAPIServer.LoopbackClientConfig)
 	if err != nil {
 		return nil, err

diff --git a/pkg/controlplane/controller/kubernetesservice/controller.go b/pkg/controlplane/controller/kubernetesservice/controller.go
@@ -155,6 +155,8 @@ func (c *Controller) Run(ch <-chan struct{}) {
 		return
 	}
 
+	KubeAPIServerEmitEventFn(corev1.EventTypeWarning, "KubeAPIReadyz", "readyz=true")
+
 	wait.NonSlidingUntil(func() {
 		// Service definition is not reconciled after first
 		// run, ports and type will be corrected only during

diff --git a/pkg/controlplane/controller/kubernetesservice/patch.go b/pkg/controlplane/controller/kubernetesservice/patch.go
@@ -0,0 +1,5 @@
+package kubernetesservice
+
+var KubeAPIServerEmitEventFn EventSinkFunc = nil
+
+type EventSinkFunc func(eventType, reason, messageFmt string, args ...interface{})