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

ignore unknown resource version in scaler error

pull/6/head
juanvallejo 2017-09-05 14:18:44 -04:00
parent 775f5d232d
commit 638a641e7d
No known key found for this signature in database
GPG Key ID: 7D2C958002D6448D
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubectl/scale.go
View File

@ -104,9 +104,11 @@ type ScaleError struct {
} }
func (c ScaleError) Error() string { func (c ScaleError) Error() string {
return fmt.Sprintf( msg := fmt.Sprintf("Scaling the resource failed with: %v", c.ActualError)
"Scaling the resource failed with: %v; Current resource version %s", if len(c.ResourceVersion) > 0 {
c.ActualError, c.ResourceVersion) msg += fmt.Sprintf("; Current resource version %s", c.ResourceVersion)
}
return msg
} }
// RetryParams encapsulates the retry parameters used by kubectl's scaler. // RetryParams encapsulates the retry parameters used by kubectl's scaler.
@ -169,7 +171,7 @@ type ReplicationControllerScaler struct {
func (scaler *ReplicationControllerScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) { func (scaler *ReplicationControllerScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) {
controller, err := scaler.c.ReplicationControllers(namespace).Get(name, metav1.GetOptions{}) controller, err := scaler.c.ReplicationControllers(namespace).Get(name, metav1.GetOptions{})
if err != nil { if err != nil {
return "", ScaleError{ScaleGetFailure, "Unknown", err} return "", ScaleError{ScaleGetFailure, "", err}
} }
if preconditions != nil { if preconditions != nil {
if err := preconditions.ValidateReplicationController(controller); err != nil { if err := preconditions.ValidateReplicationController(controller); err != nil {
@ -267,7 +269,7 @@ type ReplicaSetScaler struct {
func (scaler *ReplicaSetScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) { func (scaler *ReplicaSetScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) {
rs, err := scaler.c.ReplicaSets(namespace).Get(name, metav1.GetOptions{}) rs, err := scaler.c.ReplicaSets(namespace).Get(name, metav1.GetOptions{})
if err != nil { if err != nil {
return "", ScaleError{ScaleGetFailure, "Unknown", err} return "", ScaleError{ScaleGetFailure, "", err}
} }
if preconditions != nil { if preconditions != nil {
if err := preconditions.ValidateReplicaSet(rs); err != nil { if err := preconditions.ValidateReplicaSet(rs); err != nil {
@ -338,7 +340,7 @@ type StatefulSetScaler struct {
func (scaler *StatefulSetScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) { func (scaler *StatefulSetScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) {
ss, err := scaler.c.StatefulSets(namespace).Get(name, metav1.GetOptions{}) ss, err := scaler.c.StatefulSets(namespace).Get(name, metav1.GetOptions{})
if err != nil { if err != nil {
return "", ScaleError{ScaleGetFailure, "Unknown", err} return "", ScaleError{ScaleGetFailure, "", err}
} }
if preconditions != nil { if preconditions != nil {
if err := preconditions.ValidateStatefulSet(ss); err != nil { if err := preconditions.ValidateStatefulSet(ss); err != nil {
@ -391,7 +393,7 @@ type JobScaler struct {
func (scaler *JobScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) { func (scaler *JobScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) {
job, err := scaler.c.Jobs(namespace).Get(name, metav1.GetOptions{}) job, err := scaler.c.Jobs(namespace).Get(name, metav1.GetOptions{})
if err != nil { if err != nil {
return "", ScaleError{ScaleGetFailure, "Unknown", err} return "", ScaleError{ScaleGetFailure, "", err}
} }
if preconditions != nil { if preconditions != nil {
if err := preconditions.ValidateJob(job); err != nil { if err := preconditions.ValidateJob(job); err != nil {
@ -460,7 +462,7 @@ type DeploymentScaler struct {
func (scaler *DeploymentScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) { func (scaler *DeploymentScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) (string, error) {
deployment, err := scaler.c.Deployments(namespace).Get(name, metav1.GetOptions{}) deployment, err := scaler.c.Deployments(namespace).Get(name, metav1.GetOptions{})
if err != nil { if err != nil {
return "", ScaleError{ScaleGetFailure, "Unknown", err} return "", ScaleError{ScaleGetFailure, "", err}
} }
if preconditions != nil { if preconditions != nil {
if err := preconditions.ValidateDeployment(deployment); err != nil { if err := preconditions.ValidateDeployment(deployment); err != nil {