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

Add ServiceNetwork attribute to networks in netconfig #271

Merged
merged 1 commit into from
Sep 16, 2024

Conversation

rabi
Copy link
Contributor

@rabi rabi commented Sep 11, 2024

This would allow us to identify the ctlplane network when
using custom network and also generate inventory using
the ServiceNetwork.

Jira: https://issues.redhat.com/browse/OSPRH-10125

@openshift-ci openshift-ci bot requested review from abays and dprince September 11, 2024 06:14
@rabi rabi marked this pull request as draft September 11, 2024 07:19
@rabi
Copy link
Contributor Author

rabi commented Sep 11, 2024

We're discussing whether or how to support custom networks.

@stuggi
Copy link
Contributor

stuggi commented Sep 11, 2024

as discussed, I think an alternative approach would be to do #272 and limit the network names. the subnet names can still be customized.

@rabi rabi changed the title Add IsCtlPlane attribute to network Add ServiceNetwork attribute to networks in netconfig Sep 11, 2024
@rabi
Copy link
Contributor Author

rabi commented Sep 11, 2024

/test infra-operator-build-deploy-kuttl

@rabi rabi marked this pull request as ready for review September 12, 2024 01:38
@openshift-ci openshift-ci bot requested review from olliewalsh and viroel September 12, 2024 01:38
Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/26096d98b4404173987d9de26b7e0ffb

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 31m 22s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 15m 12s
cifmw-crc-podified-edpm-baremetal RETRY_LIMIT in 21m 25s

@rabi
Copy link
Contributor Author

rabi commented Sep 12, 2024

recheck

Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/c01a6e2db61e487789fbe4f2476f6aba

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 29m 27s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 12m 41s
cifmw-crc-podified-edpm-baremetal RETRY_LIMIT in 25m 42s

@rabi
Copy link
Contributor Author

rabi commented Sep 12, 2024

recheck Somthing is not deployed in CRC. Exit! error message is not very helpful 😄

Copy link
Contributor

@bshephar bshephar left a comment

Choose a reason for hiding this comment

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

Just the quay.io reference that actually needs to be changed. My other comment isn't overly important, but I left it there for consideration.

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: quay.io/openstack-k8s-operators/infra-operator
newName: quay.io/rabi/infra-operator
Copy link
Contributor

Choose a reason for hiding this comment

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

Needs to be reverted

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why is it even included? not in .gitignore I guess.

@@ -43,6 +45,8 @@ import (
util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
)

const CtlPlaneNetwork = "ctlplane"
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: I don't think this needs to be Heap allocated right? Looks like we're only using this const in the reconcileNormal function, so the const can be stack allocated in that function.

Unless you were planning to use it externally somewhere.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

const is a compile time construct in go, so there is no question heap/stack memory allocation for them at run time. They're logically replaced in code at compile time.

This would allow us to identify the ctlplane network when
using custom network and also generate inventory using
the ServiceNetwork.

Signed-off-by: rabi <[email protected]>
Copy link
Contributor

@stuggi stuggi left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 16, 2024
Copy link
Contributor

openshift-ci bot commented Sep 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rabi, stuggi

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

@openshift-merge-bot openshift-merge-bot bot merged commit af18c66 into openstack-k8s-operators:main Sep 16, 2024
7 checks passed
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