Skip to content

An independent branch dealing with errors #10589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 1 commit into from
Aug 23, 2016
Merged

An independent branch dealing with errors #10589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions pkg/deploy/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,22 +141,23 @@ func DeploymentDeepCopy(rc *api.ReplicationController) (*api.ReplicationControll
func DecodeDeploymentConfig(controller *api.ReplicationController, decoder runtime.Decoder) (*deployapi.DeploymentConfig, error) {
encodedConfig := []byte(EncodedDeploymentConfigFor(controller))
decoded, err := runtime.Decode(decoder, encodedConfig)
if err == nil {
if config, ok := decoded.(*deployapi.DeploymentConfig); ok {
return config, nil
}
if err != nil {
return nil, fmt.Errorf("failed to decode DeploymentConfig from controller: %v", err)
}
config, ok := decoded.(*deployapi.DeploymentConfig)
if !ok {
return nil, fmt.Errorf("decoded object from controller is not a DeploymentConfig")
}
return nil, fmt.Errorf("failed to decode DeploymentConfig from controller: %v", err)
return config, nil
}

// EncodeDeploymentConfig encodes config as a string using codec.
func EncodeDeploymentConfig(config *deployapi.DeploymentConfig, codec runtime.Codec) (string, error) {
if bytes, err := runtime.Encode(codec, config); err == nil {
return string(bytes[:]), nil
} else {
bytes, err := runtime.Encode(codec, config)
if err != nil {
return "", err
}
return string(bytes[:]), nil
}

// MakeDeployment creates a deployment represented as a ReplicationController and based on the given
Expand Down