Skip to content

Commit de020ec

Browse files
committed
aggregator/apiextensions: v(2) log why OpenAPI spec is regenerated
1 parent 533daf6 commit de020ec

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/controller.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ func (c *Controller) sync(name string) error {
168168
return nil
169169
}
170170
delete(c.crdSpecs, name)
171+
klog.V(2).Infof("Updating CRD OpenAPI spec because %s was removed", name)
171172
return c.updateSpecLocked()
172173
}
173174

@@ -183,6 +184,7 @@ func (c *Controller) sync(name string) error {
183184

184185
// update specs of this CRD
185186
c.crdSpecs[crd.Name] = newSpecs
187+
klog.V(2).Infof("Updating CRD OpenAPI spec because %s changed", name)
186188
return c.updateSpecLocked()
187189
}
188190

staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ go_library(
1717
"//staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1:go_default_library",
1818
"//vendor/github.com/emicklei/go-restful:go_default_library",
1919
"//vendor/github.com/go-openapi/spec:go_default_library",
20+
"//vendor/k8s.io/klog:go_default_library",
2021
"//vendor/k8s.io/kube-openapi/pkg/aggregator:go_default_library",
2122
"//vendor/k8s.io/kube-openapi/pkg/builder:go_default_library",
2223
"//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",

staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ import (
2525

2626
restful "github.com/emicklei/go-restful"
2727
"github.com/go-openapi/spec"
28+
"k8s.io/klog"
2829

2930
"k8s.io/apiserver/pkg/server"
30-
"k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
31+
v1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
3132
"k8s.io/kube-openapi/pkg/aggregator"
3233
"k8s.io/kube-openapi/pkg/builder"
3334
"k8s.io/kube-openapi/pkg/common"
@@ -104,6 +105,10 @@ func BuildAndRegisterAggregator(downloader *Downloader, delegationTarget server.
104105
}
105106

106107
// Build initial spec to serve.
108+
klog.V(2).Infof("Building initial OpenAPI spec")
109+
defer func(start time.Time) {
110+
klog.V(2).Infof("Finished initial OpenAPI spec generation after %v", time.Now().Sub(start))
111+
}(time.Now())
107112
specToServe, err := s.buildOpenAPISpec()
108113
if err != nil {
109114
return nil, err
@@ -209,6 +214,10 @@ func (s *specAggregator) tryUpdatingServiceSpecs(specInfo *openAPISpecInfo) erro
209214
if existedBefore && origSpecInfo != nil && origSpecInfo.etag == specInfo.etag {
210215
return nil
211216
}
217+
klog.V(2).Infof("Updating OpenAPI spec because %s is updated", specInfo.apiService.Name)
218+
defer func(start time.Time) {
219+
klog.V(2).Infof("Finished OpenAPI spec generation after %v", time.Now().Sub(start))
220+
}(time.Now())
212221
if err := s.updateOpenAPISpec(); err != nil {
213222
if existedBefore {
214223
s.openAPISpecs[specInfo.apiService.Name] = origSpecInfo
@@ -228,6 +237,10 @@ func (s *specAggregator) tryDeleteServiceSpecs(apiServiceName string) error {
228237
return nil
229238
}
230239
delete(s.openAPISpecs, apiServiceName)
240+
klog.V(2).Infof("Updating OpenAPI spec because %s is removed", apiServiceName)
241+
defer func(start time.Time) {
242+
klog.V(2).Infof("Finished OpenAPI spec generation after %v", time.Now().Sub(start))
243+
}(time.Now())
231244
if err := s.updateOpenAPISpec(); err != nil {
232245
s.openAPISpecs[apiServiceName] = orgSpecInfo
233246
return err

0 commit comments

Comments
 (0)