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

Fiixed: persistentvolumeclaims already exists #1130 #1363

Merged
merged 18 commits into from
Jun 7, 2019
Merged

Fiixed: persistentvolumeclaims already exists #1130 #1363

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
00f08b1
CheckandEstimate implementation
sarabala1979 Apr 4, 2019
e7ac42a
fixed variable rename
sarabala1979 Apr 4, 2019
d956bfc
fixed gofmt
sarabala1979 Apr 5, 2019
be9b3b5
fixed feedbacks
sarabala1979 Apr 5, 2019
0d15503
merge
sarabala1979 Apr 9, 2019
d967df3
Merge branch 'master' of https://github.com/argoproj/argo
sarabala1979 Apr 9, 2019
4c9b645
Merge branch 'master' of https://github.com/argoproj/argo
sarabala1979 Apr 10, 2019
c40cc5f
Merge branch 'master' of https://github.com/argoproj/argo
sarabala1979 Apr 11, 2019
51e2d5f
Merge branch 'master' of https://github.com/argoproj/argo
sarabala1979 Apr 26, 2019
5f41f3e
Merge branch 'master' of https://github.com/argoproj/argo
sarabala1979 May 9, 2019
94a817b
Fixed: persistentvolumeclaims already exists #1130
sarabala1979 May 9, 2019
a286412
Update operator.go
sarabala1979 May 20, 2019
314fb8d
Update operator.go
sarabala1979 May 22, 2019
9a95a48
Merge branch 'master' of https://github.com/argoproj/argo
sarabala1979 May 31, 2019
aeaf9af
Merge branch 'master' into Issue1130
sarabala1979 May 31, 2019
10b79a0
Update operator.go
sarabala1979 May 31, 2019
5773195
Update swagger.json
sarabala1979 May 31, 2019
0eca8e5
Update operator.go
sarabala1979 Jun 7, 2019
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
2 changes: 1 addition & 1 deletion api/openapi-spec/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"swagger": "2.0",
"info": {
"title": "Argo",
"version": "v2.3.0-rc3"
"version": "v2.4.0"
},
"paths": {},
"definitions": {
Expand Down
21 changes: 21 additions & 0 deletions workflow/controller/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,9 +897,30 @@ func (woc *wfOperationCtx) createPVCs() error {
*metav1.NewControllerRef(woc.wf, wfv1.SchemaGroupVersionKind),
}
pvc, err := pvcClient.Create(&pvcTmpl)
if err != nil && apierr.IsAlreadyExists(err) {
woc.log.Infof("%s pvc has already exists. Workflow is re-using it", pvcTmpl.Name)
pvc, err = pvcClient.Get(pvcTmpl.Name, metav1.GetOptions{})
if err != nil {
return err
}
hasOwnerReference := false
for i := range pvc.OwnerReferences {
ownerRef := pvc.OwnerReferences[i]
if ownerRef.UID != "" && ownerRef.UID == woc.wf.UID {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check for ownerRef.UID != "" is unnecessary. kubernetes guarantees that all entries in ownerReferences has non-empty UID.

hasOwnerReference = true
break
}
}
if !hasOwnerReference {
return errors.New(errors.CodeForbidden, "%s pvc has already exists with different ownerreference")
}
}

//continue
if err != nil {
return err
}

vol := apiv1.Volume{
Name: refName,
VolumeSource: apiv1.VolumeSource{
Expand Down