Skip to content

Fixed bug where reconcile loop could occur when user provides an invalid (non-RFC1123) secret name #186

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
omris94 merged 2 commits into from
May 27, 2025
Merged

Fixed bug where reconcile loop could occur when user provides an invalid (non-RFC1123) secret name #186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c05132
Fix bug where reconcile loop could have happened if an invalid secret…
omris94 May 27, 2025
8f6131a
fixup
omris94 May 27, 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
8 changes: 8 additions & 0 deletions src/operator/controllers/poduserpassword/db_credentials_pod_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -125,6 +126,13 @@ func (e *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu

secretName := pod.Annotations[metadata.UserAndPasswordSecretNameAnnotation]
logrus.Debug("Ensuring user-password credentials secrets for pod")
if secretNameErrors := validation.IsDNS1123Subdomain(secretName); len(secretNameErrors) > 0 {
secretNameErrorsString := strings.Join(secretNameErrors, ", ")
logrus.WithFields(logrus.Fields{"pod": pod.Name, "namespace": pod.Namespace, "secretName": secretName, "errors": secretNameErrors}).
Warningf("Invalid secret name")
e.recorder.Eventf(&pod, v1.EventTypeWarning, ReasonEnsuringPodUserAndPasswordFailed, "Invalid secret name %s: %s", secretName, secretNameErrorsString)
return ctrl.Result{}, nil
}
result, created, password, err := e.ensurePodUserAndPasswordSecret(ctx, &pod, secretName, username)
if err != nil {
e.recorder.Eventf(&pod, v1.EventTypeWarning, ReasonEnsuringPodUserAndPasswordFailed, "Failed to ensure user-password credentials secret: %s", err.Error())
Expand Down
Loading