Skip to content

Retry NGINX provisioning on all errors #4399

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
sjberman merged 2 commits into from
Dec 4, 2025
Merged

Retry NGINX provisioning on all errors #4399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e43d45b
Retry NGINX provisioning on all errors
sjberman Dec 4, 2025
42e660a
Add debug log for error message
sjberman Dec 4, 2025
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
25 changes: 16 additions & 9 deletions internal/controller/provisioner/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package provisioner

import (
"context"
"errors"
"fmt"
"slices"
"strings"
Expand Down Expand Up @@ -246,33 +247,35 @@ func (p *NginxProvisioner) provisionNginx(
createCtx, cancel := context.WithTimeout(ctx, 30*time.Second)

var res controllerutil.OperationResult
var upsertErr error
if err := wait.PollUntilContextCancel(
createCtx,
500*time.Millisecond,
true, /* poll immediately */
func(ctx context.Context) (bool, error) {
var upsertErr error
res, upsertErr = controllerutil.CreateOrUpdate(ctx, p.k8sClient, obj, objectSpecSetter(obj))
if upsertErr != nil {
if !apierrors.IsAlreadyExists(upsertErr) && !apierrors.IsConflict(upsertErr) {
return false, upsertErr
}
if apierrors.IsConflict(upsertErr) {
return false, nil
}
p.cfg.Logger.V(1).Info(
"Retrying CreateOrUpdate for nginx resource after error",
"namespace", gateway.GetNamespace(),
"name", resourceName,
"error", upsertErr.Error(),
)
return false, nil //nolint:nilerr // continue retrying
}
return true, nil
},
); err != nil {
fullErr := errors.Join(err, upsertErr)
p.cfg.EventRecorder.Eventf(
obj,
corev1.EventTypeWarning,
"CreateOrUpdateFailed",
"Failed to create or update nginx resource: %s",
err.Error(),
fullErr.Error(),
)
cancel()
return err
return fullErr
}
cancel()

Expand Down Expand Up @@ -327,6 +330,10 @@ func (p *NginxProvisioner) provisionNginx(
object = daemonSetObj
}

if object == nil {
return nil
}

p.cfg.Logger.V(1).Info(
"Restarting nginx after agent configmap update",
"name", object.GetName(),
Expand Down
4 changes: 1 addition & 3 deletions internal/controller/provisioner/setter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,7 @@ func serviceSpecSetter(
}

// Apply NGF-managed annotations (take precedence)
for k, v := range objectMeta.Annotations {
mergedAnnotations[k] = v
}
maps.Copy(mergedAnnotations, objectMeta.Annotations)

// Store current managed keys for next reconciliation
if len(currentManagedKeys) > 0 {
Expand Down
Loading