github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

updater correctly updates storageversion status

Browse Source
This commit is contained in:
Haowei Cai 2020-11-08 18:52:05 -08:00
parent 8a1d8f7fd5
commit 23ef9b51a8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/apiserver/pkg/storageversion/updater.go
View File

@ -31,7 +31,7 @@ import (
// Client has the methods required to update the storage version. // Client has the methods required to update the storage version.
type Client interface { type Client interface {
Create(context.Context, *v1alpha1.StorageVersion, metav1.CreateOptions) (*v1alpha1.StorageVersion, error) Create(context.Context, *v1alpha1.StorageVersion, metav1.CreateOptions) (*v1alpha1.StorageVersion, error)
Update(context.Context, *v1alpha1.StorageVersion, metav1.UpdateOptions) (*v1alpha1.StorageVersion, error) UpdateStatus(context.Context, *v1alpha1.StorageVersion, metav1.UpdateOptions) (*v1alpha1.StorageVersion, error)
Get(context.Context, string, metav1.GetOptions) (*v1alpha1.StorageVersion, error) Get(context.Context, string, metav1.GetOptions) (*v1alpha1.StorageVersion, error)
} }
@ -91,10 +91,16 @@ func singleUpdate(c Client, apiserverID string, gr schema.GroupResource, encodin
} }
updatedSV := localUpdateStorageVersion(sv, apiserverID, encodingVersion, decodableVersions) updatedSV := localUpdateStorageVersion(sv, apiserverID, encodingVersion, decodableVersions)
if shouldCreate { if shouldCreate {
_, err := c.Create(context.TODO(), updatedSV, metav1.CreateOptions{}) createdSV, err := c.Create(context.TODO(), updatedSV, metav1.CreateOptions{})
if err != nil {
return err
}
// assign the calculated status to the object just created, then update status
createdSV.Status = updatedSV.Status
_, err = c.UpdateStatus(context.TODO(), createdSV, metav1.UpdateOptions{})
return err return err
} }
_, err = c.Update(context.TODO(), updatedSV, metav1.UpdateOptions{}) _, err = c.UpdateStatus(context.TODO(), updatedSV, metav1.UpdateOptions{})
return err return err
} }