Skip to content

bug 1953798: stop doing live gets for optional cert syncer files that don't exist on disk yet #1064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 29, 2021
Merged

bug 1953798: stop doing live gets for optional cert syncer files that don't exist on disk yet #1064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions pkg/operator/staticpod/certsyncpod/certsync_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ func (c *CertSyncController) sync(ctx context.Context, syncCtx factory.SyncConte
continue

case apierrors.IsNotFound(err) && cm.Optional:
configMapFile := getConfigMapDir(c.destinationDir, cm.Name)
if _, err := os.Stat(configMapFile); os.IsNotExist(err) {
// if the configmap file does not exist, there is no work to do, so skip making any live check and just return.
// if the configmap actually exists in the API, we'll eventually see it on the watch.
continue
}

// Check with the live call it is really missing
configMap, err = c.configmapGetter.Get(ctx, cm.Name, metav1.GetOptions{})
if err == nil {
Expand All @@ -84,7 +91,7 @@ func (c *CertSyncController) sync(ctx context.Context, syncCtx factory.SyncConte
}

// remove missing content
if err := os.RemoveAll(getConfigMapDir(c.destinationDir, cm.Name)); err != nil {
if err := os.RemoveAll(configMapFile); err != nil {
c.eventRecorder.Warningf("CertificateUpdateFailed", "Failed removing file for configmap: %s/%s: %v", c.namespace, cm.Name, err)
errors = append(errors, err)
}
Expand Down Expand Up @@ -168,6 +175,13 @@ func (c *CertSyncController) sync(ctx context.Context, syncCtx factory.SyncConte
continue

case apierrors.IsNotFound(err) && s.Optional:
secretFile := getSecretDir(c.destinationDir, s.Name)
if _, err := os.Stat(secretFile); os.IsNotExist(err) {
// if the secret file does not exist, there is no work to do, so skip making any live check and just return.
// if the secret actually exists in the API, we'll eventually see it on the watch.
continue
}

// Check with the live call it is really missing
secret, err = c.secretGetter.Get(ctx, s.Name, metav1.GetOptions{})
if err == nil {
Expand All @@ -180,12 +194,6 @@ func (c *CertSyncController) sync(ctx context.Context, syncCtx factory.SyncConte
continue
}

// check if the secret file exists, skip firing events if it does not
secretFile := getSecretDir(c.destinationDir, s.Name)
if _, err := os.Stat(secretFile); os.IsNotExist(err) {
continue
}

// remove missing content
if err := os.RemoveAll(secretFile); err != nil {
c.eventRecorder.Warningf("CertificateUpdateFailed", "Failed removing file for missing secret: %s/%s: %v", c.namespace, s.Name, err)
Expand Down