Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
98496fa5
Commit
98496fa5
authored
May 14, 2018
by
Haowei Cai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
POSTing rollback returns deploymentstatus
parent
5782d476
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
storage.go
pkg/registry/apps/deployment/storage/storage.go
+15
-0
storage_extensions.go
pkg/registry/extensions/rest/storage_extensions.go
+12
-1
No files found.
pkg/registry/apps/deployment/storage/storage.go
View file @
98496fa5
...
@@ -21,6 +21,7 @@ import (
...
@@ -21,6 +21,7 @@ import (
"fmt"
"fmt"
"net/http"
"net/http"
externalappsv1beta1
"k8s.io/api/apps/v1beta1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/errors"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime"
...
@@ -137,6 +138,20 @@ type RollbackREST struct {
...
@@ -137,6 +138,20 @@ type RollbackREST struct {
store
*
genericregistry
.
Store
store
*
genericregistry
.
Store
}
}
// ProducesMIMETypes returns a list of the MIME types the specified HTTP verb (GET, POST, DELETE,
// PATCH) can respond with.
func
(
r
*
RollbackREST
)
ProducesMIMETypes
(
verb
string
)
[]
string
{
return
nil
}
// ProducesObject returns an object the specified HTTP verb respond with. It will overwrite storage object if
// it is not nil. Only the type of the return object matters, the value will be ignored.
func
(
r
*
RollbackREST
)
ProducesObject
(
verb
string
)
interface
{}
{
return
externalappsv1beta1
.
DeploymentStatus
{}
}
var
_
=
rest
.
StorageMetadata
(
&
RollbackREST
{})
// New creates a rollback
// New creates a rollback
func
(
r
*
RollbackREST
)
New
()
runtime
.
Object
{
func
(
r
*
RollbackREST
)
New
()
runtime
.
Object
{
return
&
extensions
.
DeploymentRollback
{}
return
&
extensions
.
DeploymentRollback
{}
...
...
pkg/registry/extensions/rest/storage_extensions.go
View file @
98496fa5
...
@@ -47,6 +47,17 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -47,6 +47,17 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
return
apiGroupInfo
,
true
return
apiGroupInfo
,
true
}
}
type
RollbackREST
struct
{
*
deploymentstore
.
RollbackREST
}
// override RollbackREST.ProducesObject
func
(
r
*
RollbackREST
)
ProducesObject
(
verb
string
)
interface
{}
{
return
extensionsapiv1beta1
.
DeploymentStatus
{}
}
var
_
=
rest
.
StorageMetadata
(
&
RollbackREST
{})
func
(
p
RESTStorageProvider
)
v1beta1Storage
(
apiResourceConfigSource
serverstorage
.
APIResourceConfigSource
,
restOptionsGetter
generic
.
RESTOptionsGetter
)
map
[
string
]
rest
.
Storage
{
func
(
p
RESTStorageProvider
)
v1beta1Storage
(
apiResourceConfigSource
serverstorage
.
APIResourceConfigSource
,
restOptionsGetter
generic
.
RESTOptionsGetter
)
map
[
string
]
rest
.
Storage
{
storage
:=
map
[
string
]
rest
.
Storage
{}
storage
:=
map
[
string
]
rest
.
Storage
{}
...
@@ -65,7 +76,7 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorag
...
@@ -65,7 +76,7 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorag
deploymentStorage
:=
deploymentstore
.
NewStorage
(
restOptionsGetter
)
deploymentStorage
:=
deploymentstore
.
NewStorage
(
restOptionsGetter
)
storage
[
"deployments"
]
=
deploymentStorage
.
Deployment
.
WithCategories
(
nil
)
storage
[
"deployments"
]
=
deploymentStorage
.
Deployment
.
WithCategories
(
nil
)
storage
[
"deployments/status"
]
=
deploymentStorage
.
Status
storage
[
"deployments/status"
]
=
deploymentStorage
.
Status
storage
[
"deployments/rollback"
]
=
deploymentStorage
.
Rollback
storage
[
"deployments/rollback"
]
=
&
RollbackREST
{
deploymentStorage
.
Rollback
}
storage
[
"deployments/scale"
]
=
deploymentStorage
.
Scale
storage
[
"deployments/scale"
]
=
deploymentStorage
.
Scale
// ingresses
// ingresses
ingressStorage
,
ingressStatusStorage
:=
ingressstore
.
NewREST
(
restOptionsGetter
)
ingressStorage
,
ingressStatusStorage
:=
ingressstore
.
NewREST
(
restOptionsGetter
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment