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

Imagestream naming #194

Merged
merged 3 commits into from
Aug 11, 2015
Merged

Imagestream naming #194

merged 3 commits into from
Aug 11, 2015

Conversation

bkabrda
Copy link

@bkabrda bkabrda commented Aug 5, 2015

This PR makes sure we get three things right:

  • imagestream argument for ImportImagePlugin
  • docker_image_repo argument for ImportImagePlugin
  • name of trigger that built image depends on

Also, the second commit fixes minor issue, where openshift url for check_and_set_rebuild wasn't previously substituted in BuildRequest.

@bkabrda
Copy link
Author

bkabrda commented Aug 5, 2015

The thing I'm not sure about is whether we want to limit osbs-client to Dockerfiles that have Name label specified (which this PR effectively does). IMO this is ok, but if someone thinks otherwise, speak up.

@twaugh
Copy link
Member

twaugh commented Aug 5, 2015

I've made a separate pull request for the check_and_set_rebuild fix, so that this pull request can be examined independently.

@bkabrda
Copy link
Author

bkabrda commented Aug 6, 2015

I'll remove the commit from this PR, then. (Just for reference, the commit is now in PR #195).

@twaugh
Copy link
Member

twaugh commented Aug 6, 2015

Just a note: the BuildConfigs and ImageStreams are both tracking the same units, so they ought to use the same names as each other.

@bkabrda
Copy link
Author

bkabrda commented Aug 7, 2015

Done, should be ready for merge.

self.dj.dock_json_set_arg('postbuild_plugins', 'import_image', 'docker_image_repo',
self.spec.imagestream_url.value)
self.dj.dock_json_set_arg('postbuild_plugins', 'import_image', 'url',
self.spec.openshift_uri.value)
Copy link
Member

Choose a reason for hiding this comment

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

I think we also want to set use_auth here, don't we? cf. line 182 further up.

"url": "{{OPENSHIFT_URI}}",
"verify_ssl": false
},
"name": "import_image"
Copy link
Member

Choose a reason for hiding this comment

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

Does the simple build type get all the rebuild trigger bits? Maybe that should only be in the prod type.

Copy link
Author

Choose a reason for hiding this comment

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

Hmm, not sure. I guess this really depends on how we define simple builds. I'm fine with only having triggers for prod builds, if others agree.

bkabrda added a commit that referenced this pull request Aug 11, 2015
- set 'use_auth' argument for 'import_image' plugin
- replace '/' by '-' in all imagestream names
- rename autorebuild bits from simple build json (also see #202)
@bkabrda
Copy link
Author

bkabrda commented Aug 11, 2015

I added a commit that addresses issues found in previous commits. Everything should be fine now.

@bkabrda
Copy link
Author

bkabrda commented Aug 11, 2015

Good catch. I'll just do a force push to not introduce a new commit...

- set 'use_auth' argument for 'import_image' plugin
- replace '/' by '-' in all imagestream names
- rename autorebuild bits from simple build json (also see #202)
@twaugh
Copy link
Member

twaugh commented Aug 11, 2015

LGTM

twaugh added a commit that referenced this pull request Aug 11, 2015
@twaugh twaugh merged commit 2711e20 into master Aug 11, 2015
@MartinBasti MartinBasti deleted the imagestream-naming branch August 13, 2019 12:05
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.

None yet

3 participants