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

Replace edpm_network_config_template with existing _override #243

Closed

Conversation

bshephar
Copy link
Contributor

@bshephar bshephar commented Jul 26, 2023

Given the way this interface is leveraged via the dataplane-operator, it
doesn't make sense to define a file path. Instead, this change moves the
existing edpm_network_config_override to be the primary interface. It
has subsequently been renamed to edpm_network_config_template.
This allows users to define jinja2 strings for the variable, and they are
rendered out to compute nodes using the copy module.

Depends-On: openstack-k8s-operators/install_yamls#451

@openshift-ci openshift-ci bot requested review from olliewalsh and rebtoor July 26, 2023 21:09
@bshephar
Copy link
Contributor Author

/hold

@bshephar
Copy link
Contributor Author

We need to fix CI to adjust for this change in the dataplane-operator CI pipeline.

@softwarefactory-project-zuul
Copy link

@bshephar bshephar force-pushed the nic-config-override branch 2 times, most recently from 21f59e0 to 75e4065 Compare July 27, 2023 02:54
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Jul 27, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
@softwarefactory-project-zuul
Copy link

bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Jul 27, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Depends-On: openstack-k8s-operators/edpm-ansible#243
Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Jul 27, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
@bshephar bshephar force-pushed the nic-config-override branch from 75e4065 to 20ae93c Compare July 27, 2023 06:34
@softwarefactory-project-zuul
Copy link

Build failed (check pipeline). For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

https://review.rdoproject.org/zuul/buildset/5fbe9aae6c4045449a7c43dfacf61237

✔️ edpm-ansible-molecule-edpm-podman SUCCESS in 6m 10s
✔️ edpm-ansible-molecule-edpm-module_load SUCCESS in 4m 52s
✔️ edpm-ansible-molecule-edpm-kernel SUCCESS in 11m 24s
✔️ edpm-ansible-content-provider SUCCESS in 2h 19m 28s
edpm-ansible-crc-podified-edpm-deployment FAILURE in 2h 07m 34s
✔️ edpm-ansible-crc-podified-edpm-baremetal SUCCESS in 1h 03m 42s

Copy link
Contributor

@slagle slagle left a comment

Choose a reason for hiding this comment

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

I understand where this is going, and I think I can get behind it. It does however have the implication that you can't use our packaged templates in the role templates dir without reproducing the content into the DataPlane resource. Hard to say how many users have actually done that historically, which is why I say I can get behind this, but I do think it's worth raising for broader awareness. May want input from the hardprov folks.

@bshephar
Copy link
Contributor Author

I understand where this is going, and I think I can get behind it. It does however have the implication that you can't use our packaged templates in the role templates dir without reproducing the content into the DataPlane resource. Hard to say how many users have actually done that historically, which is why I say I can get behind this, but I do think it's worth raising for broader awareness. May want input from the hardprov folks.

Yeah, good point. I'll loop them in for awareness.

I can't think of any situation where I have seen a user using our default network configuration files. But it would definitely be nice to get some more eyes on it to make sure we're not taking functionality away from anyone.

bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Aug 2, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Aug 2, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
@slagle
Copy link
Contributor

slagle commented Aug 3, 2023

What's holding this one up at this point? Do we just need the CI change? We might need both vars for a time to land this without breaking CI. Then we can come back around and delete the _override var once CI is updated. So the steps would be:

  1. Update CI to use _override
  2. Land this PR, with the 2 vars doing the same thing. Just set _template=_override
  3. Switch CI to use _template
  4. Remove _override

bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Aug 5, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Aug 6, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Aug 6, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Aug 7, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Aug 7, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Aug 7, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Aug 7, 2023
This change updates the nic-config samples and documentation to reflect
the changes made in:
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 7, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 7, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
@slagle slagle dismissed their stale review September 8, 2023 15:20

Need to wait for Depends-On

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bshephar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@slagle
Copy link
Contributor

slagle commented Sep 8, 2023

+2

But we need to wait for the Depends-On and to see it work with openstack-k8s-operators/dataplane-operator#394

bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 9, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 10, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 11, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 11, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 11, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 12, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 12, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 12, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 12, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 12, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 13, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 14, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/ci-framework that referenced this pull request Sep 15, 2023
We have removed the bespoke API interface used to override nic-config
files in favor or the direct Ansible variable. This change ensures that
we don't remove the variable from the template, which is currently using
the standard single-nic-vlans.j2 file:
https://github.com/openstack-k8s-operators/dataplane-operator/pull/394/files
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 15, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 15, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/ci-framework that referenced this pull request Sep 18, 2023
We have removed the bespoke API interface used to override nic-config
files in favor or the direct Ansible variable. This change ensures that
we don't remove the variable from the template, which is currently using
the standard single-nic-vlans.j2 file:
https://github.com/openstack-k8s-operators/dataplane-operator/pull/394/files
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/ci-framework that referenced this pull request Sep 18, 2023
We have removed the bespoke API interface used to override nic-config
files in favor or the direct Ansible variable. This change ensures that
we don't remove the variable from the template, which is currently using
the standard single-nic-vlans.j2 file:
https://github.com/openstack-k8s-operators/dataplane-operator/pull/394/files
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/ci-framework that referenced this pull request Sep 19, 2023
We have removed the bespoke API interface used to override nic-config
files in favor or the direct Ansible variable. This change ensures that
we don't remove the variable from the template, which is currently using
the standard single-nic-vlans.j2 file:
https://github.com/openstack-k8s-operators/dataplane-operator/pull/394/files
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/ci-framework that referenced this pull request Sep 21, 2023
We have removed the bespoke API interface used to override nic-config
files in favor or the direct Ansible variable. This change ensures that
we don't remove the variable from the template, which is currently using
the standard single-nic-vlans.j2 file:
https://github.com/openstack-k8s-operators/dataplane-operator/pull/394/files
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
@openshift-merge-robot
Copy link
Contributor

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@bshephar bshephar closed this Sep 25, 2023
@bshephar
Copy link
Contributor Author

Broke this up into more backwards compatible PR's. The last of which is this one:
#367

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants