Skip to content
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

[Backport into 5.18] bucket notification - check pvcName, not pvc DFBUGS 988, 991 (#1485) #1491

Merged
merged 1 commit into from
Dec 11, 2024
Merged

[Backport into 5.18] bucket notification - check pvcName, not pvc DFBUGS 988, 991 (#1485) #1491

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
6 changes: 3 additions & 3 deletions pkg/system/phase2_creating.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,15 +1242,15 @@ func (r *Reconciler) ReconcileODFPersistentLoggingPVC(
log := r.Logger.WithField("func", "ReconcileODFPersistentLoggingPVC")

// Return if persistent logging PVC already exists
if pvc != nil {
if pvcName != nil {
pvc.Name = *pvcName;
log.Infof("PersistentLoggingPVC %s already exists and supports RWX access mode. Skipping ReconcileODFPersistentLoggingPVC.", *pvcName)
return nil
}

util.KubeCheck(pvc)
if pvc.UID != "" {
log.Infof("Persistent logging PVC %s already exists. Skipping creation.", *pvcName )
log.Infof("Persistent logging PVC %s already exists. Skipping creation.", pvc.Name)
return nil
}

Expand All @@ -1259,7 +1259,7 @@ func (r *Reconciler) ReconcileODFPersistentLoggingPVC(
}
r.Own(pvc);

log.Infof("Persistent logging PVC %s does not exist. Creating...", *pvcName)
log.Infof("Persistent logging PVC %s does not exist. Creating...", pvc.Name)
err := r.Client.Create(r.Ctx, pvc)
if err != nil {
return err
Expand Down
Loading