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

Bug 1268000 - replace Image.DockerImageReference with value from status. #5495

Merged
merged 1 commit into from
Nov 2, 2015

Conversation

soltysh
Copy link
Contributor

@soltysh soltysh commented Oct 29, 2015

@liggitt
Copy link
Contributor

liggitt commented Oct 29, 2015

will this break the way we are using this field's value to correlate image streams with deployments in https://github.com/openshift/origin/blob/master/assets/app/scripts/services/imageStreamResolver.js#L58

cc @jwforres

@ncdc
Copy link
Contributor

ncdc commented Oct 29, 2015

See my comment here: #5481 (comment)

@miminar
Copy link

miminar commented Oct 30, 2015

LGTM. #5481 (comment) seems covered to me.

@soltysh
Copy link
Contributor Author

soltysh commented Oct 30, 2015

I don't see any more objections.
[merge]

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@soltysh
Copy link
Contributor Author

soltysh commented Oct 30, 2015

I've rebased the PR, because the error:

++ Building go targets for linux/amd64: cmd/openshift cmd/oc
# github.com/openshift/origin/pkg/image/registry/imagestreamtag
_output/local/go/src/github.com/openshift/origin/pkg/image/registry/imagestreamtag/rest.go:133: undefined: imageWithMetadata
_output/local/go/src/github.com/openshift/origin/pkg/image/registry/imagestreamtag/rest.go:133: cannot assign to imageWithMetadata.DockerImageReference
_output/local/go/src/github.com/openshift/origin/pkg/image/registry/imagestreamtag/rest.go:133: undefined: event

completely doesn't make sense to me. It looked as if local merge failed along the way.

@soltysh
Copy link
Contributor Author

soltysh commented Nov 2, 2015

Previous rebase for some reason didn't picked up the changes, this finally does.

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/3892/) (Image: devenv-rhel7_2623)

@soltysh
Copy link
Contributor Author

soltysh commented Nov 2, 2015

integration test failure, which I forgot about to check before :/

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to d94907e

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to d94907e

openshift-bot pushed a commit that referenced this pull request Nov 2, 2015
@openshift-bot openshift-bot merged commit 14aa7ba into openshift:master Nov 2, 2015
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/6562/)

@soltysh soltysh deleted the bug1268000 branch November 3, 2015 07:59
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.

5 participants