github/steve
1
0
Fork 0
mirror of https://github.com/niusmallnan/steve.git synced 2025-09-11 09:59:39 +00:00
Code Issues Projects Releases Wiki Activity

Update to k8s 1.18

Browse Source 
(cherry picked from commit 420f62f642)
This commit is contained in:
Darren Shepherd
2020-03-26 13:58:39 -07:00
committed by Arvind Iyengar
parent 682e866977
commit c5087d55cf
6 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/server/resources/userpreferences/configmap.go
View File

@@ -43,7 +43,7 @@ func (e *configMapStore) ByID(apiOp *types.APIRequest, schema *types.APISchema,
Object: pref,
}
obj, err := client.Get(prefName(u), metav1.GetOptions{})
obj, err := client.Get(apiOp.Context(), prefName(u), metav1.GetOptions{})
if apierrors.IsNotFound(err) {
return result, nil
}
@@ -71,9 +71,9 @@ func (e *configMapStore) Update(apiOp *types.APIRequest, schema *types.APISchema
return types.APIObject{}, err
}
obj, err := client.Get(prefName(u), metav1.GetOptions{})
obj, err := client.Get(apiOp.Context(), prefName(u), metav1.GetOptions{})
if apierrors.IsNotFound(err) {
_, err = client.Create(&unstructured.Unstructured{
_, err = client.Create(apiOp.Context(), &unstructured.Unstructured{
Object: map[string]interface{}{
"metadata": map[string]interface{}{
"name": prefName(u),
@@ -83,7 +83,7 @@ func (e *configMapStore) Update(apiOp *types.APIRequest, schema *types.APISchema
}, metav1.CreateOptions{})
} else if err == nil {
obj.Object["data"] = data.Data().Map("data")
_, err = client.Update(obj, metav1.UpdateOptions{})
_, err = client.Update(apiOp.Context(), obj, metav1.UpdateOptions{})
}
if err != nil {
return types.APIObject{}, err
@@ -99,5 +99,5 @@ func (e *configMapStore) Delete(apiOp *types.APIRequest, schema *types.APISchema
return types.APIObject{}, err
}
return types.APIObject{}, client.Delete(prefName(u), nil)
return types.APIObject{}, client.Delete(apiOp.Context(), prefName(u), metav1.DeleteOptions{})
}