Skip to content

K
k3s
Commit 835ee70c authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28909 from foxish/foxish-issue-28785

Automatic merge from submit-queue Create event only if creation of PVC failed. Fixes #28785. We should report an event only if the petset can't find a PVC and can't create it either. [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
parents be5e98fa 467333cc
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
pkg/controller/petset/pet.go
View file @ 835ee70c
...@@ -231,7 +231,9 @@ func (p *apiServerPetClient) getPVC(pvcName, pvcNamespace string) (*api.Persiste ...@@ -231,7 +231,9 @@ func (p *apiServerPetClient) getPVC(pvcName, pvcNamespace string) (*api.Persiste
if errors.IsNotFound(err) { if errors.IsNotFound(err) {
found = false found = false
} }
if err != nil || !found { if !found {
return nil, found, nil
} else if err != nil {
return nil, found, err return nil, found, err
} }
return pvc, true, nil return pvc, true, nil
...@@ -249,7 +251,8 @@ func (p *apiServerPetClient) SyncPVCs(pet *pcb) error { ...@@ -249,7 +251,8 @@ func (p *apiServerPetClient) SyncPVCs(pet *pcb) error {
for i, pvc := range pet.pvcs { for i, pvc := range pet.pvcs {
_, exists, err := p.getPVC(pvc.Name, pet.parent.Namespace) _, exists, err := p.getPVC(pvc.Name, pet.parent.Namespace)
if !exists { if !exists {
if err := p.createPVC(&pet.pvcs[i]); err != nil { var err error
if err = p.createPVC(&pet.pvcs[i]); err != nil {
errMsg += fmt.Sprintf("Failed to create %v: %v", pvc.Name, err) errMsg += fmt.Sprintf("Failed to create %v: %v", pvc.Name, err)
} }
p.event(pet.parent, "Create", fmt.Sprintf("pvc: %v", pvc.Name), err) p.event(pet.parent, "Create", fmt.Sprintf("pvc: %v", pvc.Name), err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment