Skip to content

Commit 3ab4efa

Browse files
committed
library-go certrotation: allow skipping initial get in applySecret
1 parent c60cfb4 commit 3ab4efa

File tree

11 files changed

+54
-44
lines changed

11 files changed

+54
-44
lines changed

pkg/operator/boundsatokensignercontroller/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func (c *BoundSATokenSignerController) ensureNextOperatorSigningSecret(ctx conte
110110
return err
111111
}
112112

113-
secret, _, err = resourceapply.ApplySecret(ctx, c.secretClient, syncCtx.Recorder(), newSecret)
113+
secret, _, err = resourceapply.ApplySecret(ctx, c.secretClient, syncCtx.Recorder(), newSecret, false)
114114
if err != nil {
115115
return err
116116
}
@@ -177,7 +177,7 @@ func (c *BoundSATokenSignerController) ensurePublicKeyConfigMap(ctx context.Cont
177177

178178
// Ensure the configmap is updated with the current public key
179179
configMap.Data[nextKeyKey] = currPublicKey
180-
configMap, _, err = resourceapply.ApplyConfigMap(ctx, c.configMapClient, syncCtx.Recorder(), configMap)
180+
configMap, _, err = resourceapply.ApplyConfigMap(ctx, c.configMapClient, syncCtx.Recorder(), configMap, false)
181181
if err != nil {
182182
return err
183183
}

pkg/operator/nodekubeconfigcontroller/nodekubeconfigcontroller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func ensureNodeKubeconfigs(ctx context.Context, client coreclientv1.CoreV1Interf
153153
}
154154
requiredSecret.Annotations[annotations.OpenShiftComponent] = "kube-apiserver"
155155

156-
_, _, err = resourceapply.ApplySecret(ctx, client, recorder, requiredSecret)
156+
_, _, err = resourceapply.ApplySecret(ctx, client, recorder, requiredSecret, false)
157157
if err != nil {
158158
return err
159159
}

pkg/operator/targetconfigcontroller/targetconfigcontroller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ func manageKubeAPIServerConfig(ctx context.Context, client coreclientv1.ConfigMa
227227
if err != nil {
228228
return nil, false, err
229229
}
230-
return resourceapply.ApplyConfigMap(ctx, client, recorder, requiredConfigMap)
230+
return resourceapply.ApplyConfigMap(ctx, client, recorder, requiredConfigMap, false)
231231
}
232232

233233
func managePods(ctx context.Context, client coreclientv1.ConfigMapsGetter, isStartupMonitorEnabledFn func() (bool, error), recorder events.Recorder, operatorSpec *operatorv1.StaticPodOperatorSpec, imagePullSpec, operatorImagePullSpec string) (*corev1.ConfigMap, bool, error) {
@@ -263,7 +263,7 @@ func managePods(ctx context.Context, client coreclientv1.ConfigMapsGetter, isSta
263263
if optionalStartupMonitor != nil {
264264
configMap.Data[startupMonitorPodKey] = resourceread.WritePodV1OrDie(optionalStartupMonitor)
265265
}
266-
return resourceapply.ApplyConfigMap(ctx, client, recorder, configMap)
266+
return resourceapply.ApplyConfigMap(ctx, client, recorder, configMap, false)
267267
}
268268

269269
func generateOptionalStartupMonitorPod(isStartupMonitorEnabledFn func() (bool, error), operatorSpec *operatorv1.StaticPodOperatorSpec, operatorImagePullSpec string) (string, *corev1.Pod, error) {
@@ -312,7 +312,7 @@ func ManageClientCABundle(ctx context.Context, lister corev1listers.ConfigMapLis
312312
}
313313
requiredConfigMap.Annotations[annotations.OpenShiftComponent] = "kube-apiserver"
314314

315-
return resourceapply.ApplyConfigMap(ctx, client, recorder, requiredConfigMap)
315+
return resourceapply.ApplyConfigMap(ctx, client, recorder, requiredConfigMap, false)
316316
}
317317

318318
func manageKubeAPIServerCABundle(ctx context.Context, lister corev1listers.ConfigMapLister, client coreclientv1.ConfigMapsGetter, recorder events.Recorder) (*corev1.ConfigMap, bool, error) {
@@ -339,7 +339,7 @@ func manageKubeAPIServerCABundle(ctx context.Context, lister corev1listers.Confi
339339
}
340340
requiredConfigMap.Annotations[annotations.OpenShiftComponent] = "kube-apiserver"
341341

342-
return resourceapply.ApplyConfigMap(ctx, client, recorder, requiredConfigMap)
342+
return resourceapply.ApplyConfigMap(ctx, client, recorder, requiredConfigMap, false)
343343
}
344344

345345
func ensureKubeAPIServerTrustedCA(ctx context.Context, client coreclientv1.CoreV1Interface, recorder events.Recorder) error {

vendor/github.com/openshift/library-go/pkg/operator/apiserver/controller/auditpolicy/auditpolicy_controller.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/operator/certrotation/cabundle.go

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

vendor/github.com/openshift/library-go/pkg/operator/certrotation/signer.go

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

vendor/github.com/openshift/library-go/pkg/operator/certrotation/target.go

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

vendor/github.com/openshift/library-go/pkg/operator/encryption/controllers/migration_controller.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/operator/encryption/controllers/state_controller.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

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

vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/generic.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)