-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
EE model changes #8644
EE model changes #8644
Conversation
Build failed.
|
The PR shanemcd#19 already merged these changes into #8598, which is targeting #8030 (like this PR). I feel like we would do best to focus our energy into merging #8598, unless there's some reason we have to do a major course correction on that, which probably wouldn't go well. |
Wait, that merge may have been undone with a force push. |
Right, we discussed it and decided that things were getting too unwieldy having everything building up in his PR, so we backed it out. |
Build failed.
|
@@ -27,6 +26,7 @@ class Meta: | |||
verbose_name=_('image location'), | |||
help_text=_("The registry location where the container is stored."), | |||
) | |||
pull = models.BooleanField(default=True) |
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 would like to see this put to use, or at least a plan of how it might be used, because it's ansible-runner
that actually uses the podman/docker commands (or not even that, with openshift). Could we leave it out until we know more?
Build failed.
|
3092bb9
to
d4f60d8
Compare
Things went very sideways when I tried to rebase this PR, but I feel pretty confident about where I ended up. Sorry for the force-pushes. The test that was failing on Friday is still failing today. Need to look into that. |
Build failed.
|
|
@@ -95,6 +95,9 @@ class Meta: | |||
job_template_admin_role = ImplicitRoleField( | |||
parent_role='admin_role', | |||
) | |||
execution_environment_admin_role = ImplicitRoleField( | |||
parent_role='admin_role', | |||
) |
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.
With the addition of this, I'd expect access.py
to switch a few things from the organization admin_role
to the execution_environment_admin_role
.
Line 1328 in c706bca
Q(organization__in=Organization.accessible_pk_qs(self.user, 'admin_role')) | |
and
Line 1335 in c706bca
return Organization.accessible_objects(self.user, 'admin_role').exists() |
and maybe?
Line 1342 in c706bca
if self.user not in obj.organization.admin_role: |
that one might depend on intent
Build failed.
|
9240c90
to
5917331
Compare
Build failed.
|
f1ef0eb
to
e169f63
Compare
Build failed.
|
Build failed.
|
Build succeeded.
|
@@ -1160,6 +1159,37 @@ def create(self): | |||
} | |||
) | |||
|
|||
ManagedCredentialType( | |||
namespace='registry', | |||
kind='registry', |
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.
Because the credential is applied to the podman
process, not the ansible-playbook
process, I think it does make sense to add a new kind
option of "registry" for pulling from an image registry.
A big "but" here - this doesn't actually add it as an option. You would need to add it to the KIND_CHOICES
listing, and this PR does not do that now.
With the way that ansible-runner
works... this might be accomplish-able by modifying os.environ
, and not making other ansible-runner code changes. There are still a lot of question marks there.
Build failed.
|
Build succeeded.
|
Build succeeded.
|
Build succeeded.
|
Build failed.
|
Build succeeded.
|
Build succeeded.
|
Merge Failed. This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset. |
1f99eb1
to
1884f27
Compare
- a new unique name field to EE - a new configure-Tower-in-Tower setting DEFAULT_EXECUTION_ENVIRONMENT - an Org-level execution_environment_admin_role - a default_environment field on Project - a new Container Registry credential type - order EEs by reverse of the created timestamp - a method to resolve which EE to use on jobs
as well as changes to other ones that need to be able to attach EEs.
so that it can be used with AdHocCommands as well.
for the failing tests.
when attaching an EE.
Build succeeded.
|
Build succeeded (gate pipeline).
|
cf99057
into
ansible:execution-environments
SUMMARY
Make the remaining outstanding model changes needed for the implementation of execution environments.
related #7064
ISSUE TYPE
COMPONENT NAME
AWX VERSION