Skip to content

Commit 18a6809

Browse files
deads2kbertinatto
authored andcommitted
UPSTREAM: <carry>: emit event when readyz goes true
OpenShift-Rebase-Source: 6386eb2
1 parent d3fdba4 commit 18a6809

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

pkg/controlplane/apiserver/server.go

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import (
2222
"os"
2323
"time"
2424

25+
"k8s.io/kubernetes/pkg/controlplane/controller/kubernetesservice"
26+
2527
coordinationapiv1 "k8s.io/api/coordination/v1"
2628
apiv1 "k8s.io/api/core/v1"
2729
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -138,6 +140,8 @@ func (c completedConfig) New(name string, delegationTarget genericapiserver.Dele
138140
VersionedInformers: c.VersionedInformers,
139141
}
140142

143+
kubernetesservice.KubeAPIServerEmitEventFn = s.GenericAPIServer.Eventf
144+
141145
client, err := kubernetes.NewForConfig(s.GenericAPIServer.LoopbackClientConfig)
142146
if err != nil {
143147
return nil, err

pkg/controlplane/controller/kubernetesservice/controller.go

+2
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ func (c *Controller) Run(ch <-chan struct{}) {
155155
return
156156
}
157157

158+
KubeAPIServerEmitEventFn(corev1.EventTypeWarning, "KubeAPIReadyz", "readyz=true")
159+
158160
wait.NonSlidingUntil(func() {
159161
// Service definition is not reconciled after first
160162
// run, ports and type will be corrected only during
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package kubernetesservice
2+
3+
var KubeAPIServerEmitEventFn EventSinkFunc = nil
4+
5+
type EventSinkFunc func(eventType, reason, messageFmt string, args ...interface{})

0 commit comments

Comments
 (0)