@@ -364,6 +364,10 @@ func ManageClientCABundle(ctx context.Context, lister corev1listers.ConfigMapLis
364
364
creationRequired = true
365
365
}
366
366
367
+ if caBundleConfigMap != nil {
368
+ klog .V (2 ).Infof ("ManageClientCABundle: CA bundle %s" , caBundleConfigMap .Name )
369
+ }
370
+
367
371
requiredConfigMap , updateRequired , err := resourcesynccontroller .CombineCABundleConfigMapsOptimistically (
368
372
caBundleConfigMap ,
369
373
lister ,
@@ -385,13 +389,17 @@ func ManageClientCABundle(ctx context.Context, lister corev1listers.ConfigMapLis
385
389
resourcesynccontroller.ResourceLocation {Namespace : operatorclient .OperatorNamespace , Name : "node-system-admin-ca" },
386
390
)
387
391
if err != nil {
392
+ klog .V (2 ).Infof ("ManageClientCABundle: err %v" , err )
388
393
return nil , false , err
389
394
}
390
395
396
+ klog .V (2 ).Infof ("ManageClientCABundle: creationRequired %v, updateRequired %v" , creationRequired , updateRequired )
397
+
391
398
if creationRequired {
392
399
caBundleConfigMap , err := client .ConfigMaps (operatorclient .TargetNamespace ).Create (ctx , requiredConfigMap , metav1.CreateOptions {})
393
400
resourcehelper .ReportCreateEvent (recorder , caBundleConfigMap , err )
394
401
if err != nil {
402
+ klog .V (2 ).Infof ("ManageClientCABundle: create err %v" , err )
395
403
return nil , false , err
396
404
}
397
405
klog .V (2 ).Infof ("Created client CA bundle configmap %s/%s" , caBundleConfigMap .Namespace , caBundleConfigMap .Name )
@@ -400,6 +408,7 @@ func ManageClientCABundle(ctx context.Context, lister corev1listers.ConfigMapLis
400
408
caBundleConfigMap , err := client .ConfigMaps (operatorclient .TargetNamespace ).Update (ctx , requiredConfigMap , metav1.UpdateOptions {})
401
409
resourcehelper .ReportUpdateEvent (recorder , caBundleConfigMap , err )
402
410
if err != nil {
411
+ klog .V (2 ).Infof ("ManageClientCABundle: update err %v" , err )
403
412
return nil , false , err
404
413
}
405
414
klog .V (2 ).Infof ("Updated client CA bundle configmap %s/%s" , caBundleConfigMap .Namespace , caBundleConfigMap .Name )
@@ -426,6 +435,10 @@ func manageKubeAPIServerCABundle(ctx context.Context, lister corev1listers.Confi
426
435
creationRequired = true
427
436
}
428
437
438
+ if caBundleConfigMap != nil {
439
+ klog .V (2 ).Infof ("manageKubeAPIServerCABundle: CA bundle %s" , caBundleConfigMap .Name )
440
+ }
441
+
429
442
requiredConfigMap , updateRequired , err := resourcesynccontroller .CombineCABundleConfigMapsOptimistically (
430
443
caBundleConfigMap ,
431
444
lister ,
@@ -440,13 +453,17 @@ func manageKubeAPIServerCABundle(ctx context.Context, lister corev1listers.Confi
440
453
resourcesynccontroller.ResourceLocation {Namespace : operatorclient .OperatorNamespace , Name : "localhost-recovery-serving-ca" },
441
454
)
442
455
if err != nil {
456
+ klog .V (2 ).Infof ("manageKubeAPIServerCABundle: err %v" , err )
443
457
return nil , false , err
444
458
}
445
459
460
+ klog .V (2 ).Infof ("ManageClientCABundle: creationRequired %v, updateRequired %v" , creationRequired , updateRequired )
461
+
446
462
if creationRequired {
447
463
caBundleConfigMap , err := client .ConfigMaps (operatorclient .TargetNamespace ).Create (ctx , requiredConfigMap , metav1.CreateOptions {})
448
464
resourcehelper .ReportCreateEvent (recorder , caBundleConfigMap , err )
449
465
if err != nil {
466
+ klog .V (2 ).Infof ("manageKubeAPIServerCABundle: create err %v" , err )
450
467
return nil , false , err
451
468
}
452
469
klog .V (2 ).Infof ("Created kube apiserver CA bundle configmap %s/%s" , caBundleConfigMap .Namespace , caBundleConfigMap .Name )
@@ -455,6 +472,7 @@ func manageKubeAPIServerCABundle(ctx context.Context, lister corev1listers.Confi
455
472
caBundleConfigMap , err := client .ConfigMaps (operatorclient .TargetNamespace ).Update (ctx , requiredConfigMap , metav1.UpdateOptions {})
456
473
resourcehelper .ReportUpdateEvent (recorder , caBundleConfigMap , err )
457
474
if err != nil {
475
+ klog .V (2 ).Infof ("manageKubeAPIServerCABundle: update err %v" , err )
458
476
return nil , false , err
459
477
}
460
478
klog .V (2 ).Infof ("Updated kube apiserver CA bundle configmap %s/%s" , caBundleConfigMap .Namespace , caBundleConfigMap .Name )
0 commit comments