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

Merge pull request #101865 from sanwishe/structuredLogdynamiccertificates

Browse Source 
Structured Logging migration: for package staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates
This commit is contained in:
Kubernetes Prow Robot
2021-05-13 08:14:26 -07:00
committed by GitHub
parent b7e50cd60c 6eb645088c
commit f594c25c70
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/configmap_cafile_content.go
View File

@@ -198,8 +198,8 @@ func (c *ConfigMapCAController) Run(workers int, stopCh <-chan struct{}) {
defer utilruntime.HandleCrash() defer utilruntime.HandleCrash()
defer c.queue.ShutDown() defer c.queue.ShutDown()
klog.Infof("Starting %s", c.name) klog.InfoS("Starting controller", "name", c.name)
defer klog.Infof("Shutting down %s", c.name) defer klog.InfoS("Shutting down controller", "name", c.name)
// we have a personal informer that is narrowly scoped, start it. // we have a personal informer that is narrowly scoped, start it.
go c.configMapInformer.Run(stopCh) go c.configMapInformer.Run(stopCh)

6
staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_cafile_content.go
View File

@@ -114,7 +114,7 @@ func (c *DynamicFileCAContent) loadCABundle() error {
return err return err
} }
c.caBundle.Store(caBundleAndVerifier) c.caBundle.Store(caBundleAndVerifier)
klog.V(2).Infof("Loaded a new CA Bundle and Verifier for %q", c.Name()) klog.V(2).InfoS("Loaded a new CA Bundle and Verifier", "name", c.Name())
for _, listener := range c.listeners { for _, listener := range c.listeners {
listener.Enqueue() listener.Enqueue()
@@ -152,8 +152,8 @@ func (c *DynamicFileCAContent) Run(workers int, stopCh <-chan struct{}) {
defer utilruntime.HandleCrash() defer utilruntime.HandleCrash()
defer c.queue.ShutDown() defer c.queue.ShutDown()
klog.Infof("Starting %s", c.name) klog.InfoS("Starting controller", "name", c.name)
defer klog.Infof("Shutting down %s", c.name) defer klog.InfoS("Shutting down controller", "name", c.name)
// doesn't matter what workers say, only start one. // doesn't matter what workers say, only start one.
go wait.Until(c.runWorker, time.Second, stopCh) go wait.Until(c.runWorker, time.Second, stopCh)

6
staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_serving_content.go
View File

@@ -107,7 +107,7 @@ func (c *DynamicCertKeyPairContent) loadCertKeyPair() error {
} }
c.certKeyPair.Store(newCertKey) c.certKeyPair.Store(newCertKey)
klog.V(2).Infof("Loaded a new cert/key pair for %q", c.Name()) klog.V(2).InfoS("Loaded a new cert/key pair", "name", c.Name())
for _, listener := range c.listeners { for _, listener := range c.listeners {
listener.Enqueue() listener.Enqueue()
@@ -126,8 +126,8 @@ func (c *DynamicCertKeyPairContent) Run(workers int, stopCh <-chan struct{}) {
defer utilruntime.HandleCrash() defer utilruntime.HandleCrash()
defer c.queue.ShutDown() defer c.queue.ShutDown()
klog.Infof("Starting %s", c.name) klog.InfoS("Starting controller", "name", c.name)
defer klog.Infof("Shutting down %s", c.name) defer klog.InfoS("Shutting down controller", "name", c.name)
// doesn't matter what workers say, only start one. // doesn't matter what workers say, only start one.
go wait.Until(c.runWorker, time.Second, stopCh) go wait.Until(c.runWorker, time.Second, stopCh)

2
staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/named_certificates.go
View File

@@ -50,7 +50,7 @@ func (c *DynamicServingCertificateController) BuildNamedCertificates(sniCerts []
byNameExplicit[name] = &cert byNameExplicit[name] = &cert
} }
klog.V(2).Infof("loaded SNI cert [%d/%q]: %s", i, c.sniCerts[i].Name(), GetHumanCertDetail(x509Cert)) klog.V(2).InfoS("Loaded SNI cert", "index", i, "certName", c.sniCerts[i].Name(), "certDetail", GetHumanCertDetail(x509Cert))
if c.eventRecorder != nil { if c.eventRecorder != nil {
c.eventRecorder.Eventf(&corev1.ObjectReference{Name: c.sniCerts[i].Name()}, nil, corev1.EventTypeWarning, "TLSConfigChanged", "SNICertificateReload", "loaded SNI cert [%d/%q]: %s with explicit names %v", i, c.sniCerts[i].Name(), GetHumanCertDetail(x509Cert), names) c.eventRecorder.Eventf(&corev1.ObjectReference{Name: c.sniCerts[i].Name()}, nil, corev1.EventTypeWarning, "TLSConfigChanged", "SNICertificateReload", "loaded SNI cert [%d/%q]: %s with explicit names %v", i, c.sniCerts[i].Name(), GetHumanCertDetail(x509Cert), names)
} }

8
staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/tlsconfig.go
View File

@@ -175,7 +175,7 @@ func (c *DynamicServingCertificateController) syncCerts() error {
return fmt.Errorf("unable to load client CA file %q: %v", string(newContent.clientCA.caBundle), err) return fmt.Errorf("unable to load client CA file %q: %v", string(newContent.clientCA.caBundle), err)
} }
for i, cert := range newClientCAs { for i, cert := range newClientCAs {
klog.V(2).Infof("loaded client CA [%d/%q]: %s", i, c.clientCA.Name(), GetHumanCertDetail(cert)) klog.V(2).InfoS("Loaded client CA", "index", i, "certName", c.clientCA.Name(), "certDetail", GetHumanCertDetail(cert))
if c.eventRecorder != nil { if c.eventRecorder != nil {
c.eventRecorder.Eventf(&corev1.ObjectReference{Name: c.clientCA.Name()}, nil, corev1.EventTypeWarning, "TLSConfigChanged", "CACertificateReload", "loaded client CA [%d/%q]: %s", i, c.clientCA.Name(), GetHumanCertDetail(cert)) c.eventRecorder.Eventf(&corev1.ObjectReference{Name: c.clientCA.Name()}, nil, corev1.EventTypeWarning, "TLSConfigChanged", "CACertificateReload", "loaded client CA [%d/%q]: %s", i, c.clientCA.Name(), GetHumanCertDetail(cert))
} }
@@ -197,7 +197,7 @@ func (c *DynamicServingCertificateController) syncCerts() error {
return fmt.Errorf("invalid serving cert: %v", err) return fmt.Errorf("invalid serving cert: %v", err)
} }
klog.V(2).Infof("loaded serving cert [%q]: %s", c.servingCert.Name(), GetHumanCertDetail(x509Cert)) klog.V(2).InfoS("Loaded serving cert", "certName", c.servingCert.Name(), "certDetail", GetHumanCertDetail(x509Cert))
if c.eventRecorder != nil { if c.eventRecorder != nil {
c.eventRecorder.Eventf(&corev1.ObjectReference{Name: c.servingCert.Name()}, nil, corev1.EventTypeWarning, "TLSConfigChanged", "ServingCertificateReload", "loaded serving cert [%q]: %s", c.servingCert.Name(), GetHumanCertDetail(x509Cert)) c.eventRecorder.Eventf(&corev1.ObjectReference{Name: c.servingCert.Name()}, nil, corev1.EventTypeWarning, "TLSConfigChanged", "ServingCertificateReload", "loaded serving cert [%q]: %s", c.servingCert.Name(), GetHumanCertDetail(x509Cert))
} }
@@ -237,8 +237,8 @@ func (c *DynamicServingCertificateController) Run(workers int, stopCh <-chan str
defer utilruntime.HandleCrash() defer utilruntime.HandleCrash()
defer c.queue.ShutDown() defer c.queue.ShutDown()
klog.Infof("Starting DynamicServingCertificateController") klog.InfoS("Starting DynamicServingCertificateController")
defer klog.Infof("Shutting down DynamicServingCertificateController") defer klog.InfoS("Shutting down DynamicServingCertificateController")
// synchronously load once. We will trigger again, so ignoring any error is fine // synchronously load once. We will trigger again, so ignoring any error is fine
_ = c.RunOnce() _ = c.RunOnce()