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

Merge pull request #69359 from roycaihw/install-create-update-options 

Add CreateOptions and UpdateOptions to apiserver rest parameter installation

Kubernetes-commit: 0928bb4c01f6e7ed7c8b990693dd9ea27873def7
This commit is contained in:
Kubernetes Publisher 2018-10-04 18:19:49 -07:00
parent b659fd37b4 56ca9f4a1c
commit 0bda7a15e3
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/endpoints/installer.go
View File

@ -262,6 +262,14 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
if err != nil { if err != nil {
return nil, err return nil, err
} }
versionedCreateOptions, err := a.group.Creater.New(optionsExternalVersion.WithKind("CreateOptions"))
if err != nil {
return nil, err
}
versionedUpdateOptions, err := a.group.Creater.New(optionsExternalVersion.WithKind("UpdateOptions"))
if err != nil {
return nil, err
}
var versionedDeleteOptions runtime.Object var versionedDeleteOptions runtime.Object
var versionedDeleterObject interface{} var versionedDeleterObject interface{}
@ -651,6 +659,9 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
Returns(http.StatusCreated, "Created", producedObject). Returns(http.StatusCreated, "Created", producedObject).
Reads(defaultVersionedObject). Reads(defaultVersionedObject).
Writes(producedObject) Writes(producedObject)
if err := addObjectParams(ws, route, versionedUpdateOptions); err != nil {
return nil, err
}
addParams(route, action.Params) addParams(route, action.Params)
routes = append(routes, route) routes = append(routes, route)
case "PATCH": // Partially update a resource case "PATCH": // Partially update a resource
@ -673,6 +684,9 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
Returns(http.StatusOK, "OK", producedObject). Returns(http.StatusOK, "OK", producedObject).
Reads(metav1.Patch{}). Reads(metav1.Patch{}).
Writes(producedObject) Writes(producedObject)
if err := addObjectParams(ws, route, versionedUpdateOptions); err != nil {
return nil, err
}
addParams(route, action.Params) addParams(route, action.Params)
routes = append(routes, route) routes = append(routes, route)
case "POST": // Create a resource. case "POST": // Create a resource.
@ -700,6 +714,9 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
Returns(http.StatusAccepted, "Accepted", producedObject). Returns(http.StatusAccepted, "Accepted", producedObject).
Reads(defaultVersionedObject). Reads(defaultVersionedObject).
Writes(producedObject) Writes(producedObject)
if err := addObjectParams(ws, route, versionedCreateOptions); err != nil {
return nil, err
}
addParams(route, action.Params) addParams(route, action.Params)
routes = append(routes, route) routes = append(routes, route)
case "DELETE": // Delete a resource. case "DELETE": // Delete a resource.