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
ae63a470
Commit
ae63a470
authored
Sep 19, 2018
by
Haowei Cai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
POSTing rollback returns metav1.Status
parent
4e599c84
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
14 deletions
+2
-14
storage.go
pkg/registry/apps/deployment/storage/storage.go
+1
-2
storage_extensions.go
pkg/registry/extensions/rest/storage_extensions.go
+1
-12
No files found.
pkg/registry/apps/deployment/storage/storage.go
View file @
ae63a470
...
@@ -21,7 +21,6 @@ import (
...
@@ -21,7 +21,6 @@ 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"
...
@@ -149,7 +148,7 @@ func (r *RollbackREST) ProducesMIMETypes(verb string) []string {
...
@@ -149,7 +148,7 @@ func (r *RollbackREST) ProducesMIMETypes(verb string) []string {
// ProducesObject returns an object the specified HTTP verb respond with. It will overwrite storage object if
// 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.
// it is not nil. Only the type of the return object matters, the value will be ignored.
func
(
r
*
RollbackREST
)
ProducesObject
(
verb
string
)
interface
{}
{
func
(
r
*
RollbackREST
)
ProducesObject
(
verb
string
)
interface
{}
{
return
externalappsv1beta1
.
Deployment
Status
{}
return
metav1
.
Status
{}
}
}
var
_
=
rest
.
StorageMetadata
(
&
RollbackREST
{})
var
_
=
rest
.
StorageMetadata
(
&
RollbackREST
{})
...
...
pkg/registry/extensions/rest/storage_extensions.go
View file @
ae63a470
...
@@ -47,17 +47,6 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
...
@@ -47,17 +47,6 @@ 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
{}
...
@@ -76,7 +65,7 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource serverstorag
...
@@ -76,7 +65,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"
]
=
&
RollbackREST
{
deploymentStorage
.
Rollback
}
storage
[
"deployments/rollback"
]
=
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