Skip to content
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.

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

deploy: remove leading and trailing spaces from images #14744

Merged
merged 1 commit into from
Jun 21, 2017

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Jun 19, 2017

Fixes: #14659

@mfojtik
Copy link
Contributor Author

mfojtik commented Jun 19, 2017

@tnozicka PTAL

Copy link
Contributor

@tnozicka tnozicka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small nit, lgtm

@@ -266,6 +266,13 @@ func MakeDeployment(config *deployapi.DeploymentConfig, codec runtime.Codec) (*a
return nil, fmt.Errorf("couldn't clone podSpec: %v", err)
}

// Fix trailing and leading whitespace in the image field
// This is needed to sanitize old deployment configs where spaces were permitted but
// kuberneted 3.7 tightened the validation of container image fields.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/kuberneted/kubernetes
maybe a ref to a PR making this change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed.

@mfojtik
Copy link
Contributor Author

mfojtik commented Jun 19, 2017

[test]

@mfojtik mfojtik force-pushed the ensure-no-whitespace branch 2 times, most recently from befbcd2 to 8968bde Compare June 20, 2017 09:04
@mfojtik
Copy link
Contributor Author

mfojtik commented Jun 20, 2017

re-[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 9cfb037

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2422/) (Base Commit: e50d999) (PR Branch Commit: 9cfb037)

@mfojtik
Copy link
Contributor Author

mfojtik commented Jun 21, 2017

[merge][severity:blocker]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 9cfb037

@openshift-bot
Copy link
Contributor

openshift-bot commented Jun 21, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/1077/) (Base Commit: 7461c10) (PR Branch Commit: 9cfb037) (Extended Tests: blocker) (Image: devenv-rhel7_6392)

@openshift-bot openshift-bot merged commit 857cfa5 into openshift:master Jun 21, 2017
@mfojtik mfojtik deleted the ensure-no-whitespace branch September 5, 2018 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants