Merge pull request #9889 from kargakis/bug-1356530

OpenShift Bot · web-flow · commit 38a6fdbe1642 · 2016-07-19T08:06:51.000-04:00
Merged by openshift-bot
diff --git a/pkg/cmd/cli/cmd/rollback.go b/pkg/cmd/cli/cmd/rollback.go
@@ -234,7 +234,7 @@ func (o *RollbackOptions) Run() error {
 		},
 	}
 	newConfig, err := o.oc.DeploymentConfigs(o.Namespace).Rollback(rollback)
-	if kerrors.IsNotFound(err) {
+	if kerrors.IsNotFound(err) || kerrors.IsForbidden(err) {
 		// Fallback to the old path for new clients talking to old servers.
 		newConfig, err = o.oc.DeploymentConfigs(o.Namespace).RollbackDeprecated(rollback)
 	}

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ func (o *RollbackOptions) Run() error {`
`234`	`234`	`},`
`235`	`235`	`}`
`236`	`236`	`newConfig, err := o.oc.DeploymentConfigs(o.Namespace).Rollback(rollback)`
`237`		`- if kerrors.IsNotFound(err) {`
	`237`	`+ if kerrors.IsNotFound(err) \|\| kerrors.IsForbidden(err) {`
`238`	`238`	`// Fallback to the old path for new clients talking to old servers.`
`239`	`239`	`newConfig, err = o.oc.DeploymentConfigs(o.Namespace).RollbackDeprecated(rollback)`
`240`	`240`	`}`