github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #66719 from hanxiaoshuai/fix0727 

Automatic merge from submit-queue (batch tested with PRs 67938, 66719, 67883). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

return err when Unmarshal failed

**What this PR does / why we need it**:
return err when Unmarshal failed
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-08-28 10:02:05 -07:00 committed by GitHub
parent b5382c347e 6c94d7ae32
commit 256070adcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubectl/rollback.go
View File

@ -418,7 +418,9 @@ func getStatefulSetPatch(set *appsv1.StatefulSet) ([]byte, error) {
return nil, err return nil, err
} }
var raw map[string]interface{} var raw map[string]interface{}
json.Unmarshal([]byte(str), &raw) if err := json.Unmarshal([]byte(str), &raw); err != nil {
return nil, err
}
objCopy := make(map[string]interface{}) objCopy := make(map[string]interface{})
specCopy := make(map[string]interface{}) specCopy := make(map[string]interface{})
spec := raw["spec"].(map[string]interface{}) spec := raw["spec"].(map[string]interface{})