Skip to content

Commit 772f980

Browse files
committed
Update targetconfigcontroller.go
1 parent a92da07 commit 772f980

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

pkg/operator/targetconfigcontroller/targetconfigcontroller.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,7 @@ func manageServiceAccountCABundle(ctx context.Context, lister corev1listers.Conf
745745
}
746746

747747
func ManageCSRCABundle(ctx context.Context, lister corev1listers.ConfigMapLister, client corev1client.ConfigMapsGetter, recorder events.Recorder) (*corev1.ConfigMap, bool, error) {
748+
klog.Info("ManageCSRCABundle+")
748749
additionalAnnotations := certrotation.AdditionalAnnotations{
749750
JiraComponent: "kube-controller-manager",
750751
Description: "CA to recognize the CSRs (both serving and client) signed by the kube-controller-manager.",
@@ -764,10 +765,13 @@ func ManageCSRCABundle(ctx context.Context, lister corev1listers.ConfigMapLister
764765
Namespace: operatorclient.OperatorNamespace,
765766
},
766767
}
768+
klog.Infof("ManageCSRCABundle: new %#v", caBundleConfigMap)
767769
case err != nil:
768770
return nil, false, err
769771
}
770772

773+
klog.Infof("ManageCSRCABundle: initial cm %#v", caBundleConfigMap)
774+
771775
requiredConfigMap, updateRequired, err := resourcesynccontroller.CombineCABundleConfigMapsOptimistically(
772776
caBundleConfigMap,
773777
lister,
@@ -782,6 +786,7 @@ func ManageCSRCABundle(ctx context.Context, lister corev1listers.ConfigMapLister
782786
}
783787
if creationRequired {
784788
caBundleConfigMap, err = client.ConfigMaps(operatorclient.OperatorNamespace).Create(ctx, requiredConfigMap, metav1.CreateOptions{})
789+
klog.Infof("ManageCSRCABundle: create: %#v, %#v", caBundleConfigMap, err)
785790
resourcehelper.ReportCreateEvent(recorder, caBundleConfigMap, err)
786791
if err != nil {
787792
return nil, false, err
@@ -790,6 +795,7 @@ func ManageCSRCABundle(ctx context.Context, lister corev1listers.ConfigMapLister
790795
return caBundleConfigMap, true, nil
791796
} else if updateRequired {
792797
caBundleConfigMap, err = client.ConfigMaps(operatorclient.OperatorNamespace).Update(ctx, requiredConfigMap, metav1.UpdateOptions{})
798+
klog.Infof("ManageCSRCABundle: update: %#v, %#v", caBundleConfigMap, err)
793799
resourcehelper.ReportUpdateEvent(recorder, caBundleConfigMap, err)
794800
if err != nil {
795801
return nil, false, err
@@ -798,6 +804,7 @@ func ManageCSRCABundle(ctx context.Context, lister corev1listers.ConfigMapLister
798804
return caBundleConfigMap, true, nil
799805
}
800806

807+
klog.Info("ManageCSRCABundle-")
801808
return caBundleConfigMap, false, nil
802809
}
803810

vendor/github.com/openshift/library-go/pkg/operator/resourcesynccontroller/core.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)