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

Merge pull request #51244 from lichuqiang/fix_rollback

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51244, 50559, 49770, 51194, 50901)

fix status in deployment_rollback response

**What this PR does / why we need it**:

fix status in deployment_rollback response

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
#51243
This commit is contained in:
Kubernetes Submit Queue 2017-08-25 04:11:05 -07:00 committed by GitHub
commit 69187e0651
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/registry/extensions/deployment/storage/storage.go
View File

@ -146,6 +146,7 @@ func (r *RollbackREST) Create(ctx genericapirequest.Context, obj runtime.Object,
return nil, err
}
return &metav1.Status{
Status: metav1.StatusSuccess,
Message: fmt.Sprintf("rollback request for deployment %q succeeded", rollback.Name),
Code: http.StatusOK,
}, nil

13
pkg/registry/extensions/deployment/storage/storage_test.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package storage
import (
"net/http"
"reflect"
"testing"
@ -343,10 +344,18 @@ func TestEtcdCreateDeploymentRollback(t *testing.T) {
if _, err := storage.Deployment.Create(ctx, validNewDeployment(), false); err != nil {
t.Fatalf("%s: unexpected error: %v", k, err)
}
if _, err := rollbackStorage.Create(ctx, &test.rollback, false); !test.errOK(err) {
rollbackRespStatus, err := rollbackStorage.Create(ctx, &test.rollback, false)
if !test.errOK(err) {
t.Errorf("%s: unexpected error: %v", k, err)
} else if err == nil {
// If rollback succeeded, verify Rollback field of deployment
// If rollback succeeded, verify Rollback response and Rollback field of deployment
status, ok := rollbackRespStatus.(*metav1.Status)
if !ok {
t.Errorf("%s: unexpected response format", k)
}
if status.Code != http.StatusOK || status.Status != metav1.StatusSuccess {
t.Errorf("%s: unexpected response, code: %d, status: %s", k, status.Code, status.Status)
}
d, err := storage.Deployment.Get(ctx, validNewDeployment().ObjectMeta.Name, &metav1.GetOptions{})
if err != nil {
t.Errorf("%s: unexpected error: %v", k, err)