Skip to content

Commit ea75e90

Browse files
committed
Only fetch service CA if we actually need to update a ConfigMap
1 parent 098c911 commit ea75e90

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

controllers/configmap_controller.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ func (r *ConfigMapReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
7171
return ctrl.Result{}, err
7272
}
7373

74-
serviceCA, err := certs.GetServiceCA(ctx, r.Client, l, r.CANamespace)
75-
if err != nil {
76-
l.Info("Service CA not ready yet, requeuing request")
77-
return ctrl.Result{}, err
78-
}
7974
cmLabels := cm.Labels
8075
if cmLabels == nil {
8176
// nothing to do, exit
@@ -99,6 +94,12 @@ func (r *ConfigMapReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
9994
return ctrl.Result{}, nil
10095
}
10196

97+
serviceCA, err := certs.GetServiceCA(ctx, r.Client, l, r.CANamespace)
98+
if err != nil {
99+
l.Info("Service CA not ready yet, requeuing request")
100+
return ctrl.Result{}, err
101+
}
102+
102103
origCM := cm.DeepCopy()
103104
if cm.Data == nil {
104105
cm.Data = map[string]string{}

0 commit comments

Comments
 (0)