-
Notifications
You must be signed in to change notification settings - Fork 19
Expose the container registry URL #30
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
Draft
ekohl
wants to merge
1
commit into
theforeman:master
Choose a base branch
from
ekohl:expose-pulpcore-registry-url
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,22 @@ | ||
| --- | ||
| :enabled: true | ||
| #:pulp_url: https://localhost/ | ||
| #:content_app_url: https://localhost:24816/ | ||
|
|
||
| # The URL serving the pulpcore-api without any path | ||
| #:pulp_url: https://localhost:24817/ | ||
| # Only set this if the container registry is present. This points to pulpcore-api. | ||
| # Can also be set to true in which case it'll be derived from pulp_url | ||
| #:container_registry_url: https://localhost:24817/pulpcore_registry | ||
| # The content URL. This points to pulpcore-content | ||
| #:content_app_url: https://localhost:24816/pulp/content | ||
|
|
||
| # Expose which client authentication works. At least one is needed. | ||
| # client_certificate and client_certificate_admin_only are mutually exclusive | ||
| # Possible values | ||
| #:client_authentication: ['password', 'client_certificate', 'client_certificate_admin_only'] | ||
|
|
||
| # Not needed in most production setups | ||
| #:username: admin | ||
| #:password: password | ||
|
|
||
| # False implies it's a primary. There should only be one primary in your infra | ||
| #:mirror: false | ||
| #:client_authentication: ['password', 'client_certificate'] | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the part about pulpcore-api is incorrect. The registry endpoint is present on the content app.
Can you have the registry end point running at a different
host:portcombo that the content app? @jlsherrillThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you certain? I based this on https://github.com/theforeman/puppet-pulpcore/blob/7a5543b1a47de8d76a1cad1fb76e12db7bbf8e45/manifests/plugin/container.pp#L9-L21.
Now that look I see we also have an Ansible Galaxy endpoint:
https://github.com/theforeman/puppet-pulpcore/blob/7a5543b1a47de8d76a1cad1fb76e12db7bbf8e45/manifests/plugin/ansible.pp#L6-L16
Perhaps that should be exposed as well so Katello doesn't have to guess. @jlsherrill is that used anywhere within Katello?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This https://github.com/Katello/katello/pull/9450/files#diff-bda566f2c5501c43867744c439cd22a7686af2940052749f3414e7b10c51308cR29-R30 constructs it based on the content app URL. I guess I don't right know which is which right at the moment. Save us Obi-Wan