knative
/
client
mirror of https://github.com/knative/client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(wait): set foreground propagationPolicy in sync service delete

This commit is contained in:
David Simansky 2020-02-24 10:09:37 +01:00
parent b97e2ca8ff
commit a49748c4bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/serving/v1/client.go
View File

@ -257,7 +257,7 @@ func updateServiceWithRetry(cl KnServingClient, name string, updateFunc serviceU
// For `timeout == 0` delete is performed async without any wait. // For `timeout == 0` delete is performed async without any wait.
func (cl *knServingClient) DeleteService(serviceName string, timeout time.Duration) error { func (cl *knServingClient) DeleteService(serviceName string, timeout time.Duration) error {
if timeout == 0 { if timeout == 0 {
return cl.deleteService(serviceName) return cl.deleteService(serviceName, v1.DeletePropagationBackground)
} }
waitC := make(chan error) waitC := make(chan error)
go func() { go func() {
@ -265,17 +265,17 @@ func (cl *knServingClient) DeleteService(serviceName string, timeout time.Durati
err, _ := waitForEvent.Wait(serviceName, timeout, wait.NoopMessageCallback()) err, _ := waitForEvent.Wait(serviceName, timeout, wait.NoopMessageCallback())
waitC <- err waitC <- err
}() }()
err := cl.deleteService(serviceName) err := cl.deleteService(serviceName, v1.DeletePropagationForeground)
if err != nil { if err != nil {
return err return err
} }
return <-waitC return <-waitC
} }
func (cl *knServingClient) deleteService(serviceName string) error { func (cl *knServingClient) deleteService(serviceName string, propagationPolicy v1.DeletionPropagation) error {
err := cl.client.Services(cl.namespace).Delete( err := cl.client.Services(cl.namespace).Delete(
serviceName, serviceName,
&v1.DeleteOptions{}, &v1.DeleteOptions{PropagationPolicy: &propagationPolicy},
) )
if err != nil { if err != nil {
return clienterrors.GetError(err) return clienterrors.GetError(err)