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