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

CNF-14652: Update API group for Cluster Request&Template #227

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

irinamihai
Copy link
Collaborator

Description:

  • update the API group to o2ims.provisioning.oran.org for ClusterRequest and ClusterTemplate
  • move ClusterRequest and ClusterTemplate APIs to their own directory and go module
  • move the Inventory API to its own directory and go module

@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Oct 1, 2024

@irinamihai: This pull request references CNF-14652 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.18.0" version, but no target version was set.

In response to this:

Description:

  • update the API group to o2ims.provisioning.oran.org for ClusterRequest and ClusterTemplate
  • move ClusterRequest and ClusterTemplate APIs to their own directory and go module
  • move the Inventory API to its own directory and go module

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link

openshift-ci bot commented Oct 1, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from irinamihai. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@irinamihai
Copy link
Collaborator Author

/hold
Still going through some end to end tests

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 1, 2024
@irinamihai irinamihai force-pushed the update-api-groups branch 2 times, most recently from 65c2eeb to e998381 Compare October 2, 2024 14:36
@irinamihai irinamihai requested review from donpenney and removed request for jhernand and tliu2021 October 2, 2024 18:35
@irinamihai
Copy link
Collaborator Author

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 2, 2024
@@ -22,7 +22,9 @@ require (
github.com/json-iterator/go v1.1.12
github.com/onsi/ginkgo/v2 v2.14.0
github.com/onsi/gomega v1.30.0
github.com/openshift-kni/oran-o2ims/api/hardwaremanagement v0.0.0-00010101000000-000000000000
github.com/openshift-kni/oran-o2ims/api/hardwaremanagement v0.0.0-20241001130125-a052f08603f7
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is this version being changed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It was changed automatically when I did a go mod tidy + go mod vendor.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't think it should have been. Plus, we have that performed by ci-job on each PR. The update includes upversioning multiple dependencies, in addition to the restructuring. Maybe you inadvertently also upgraded this module?

Copy link
Collaborator Author

@irinamihai irinamihai Oct 2, 2024

Choose a reason for hiding this comment

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

I noticed the hardware manager gets included as a required module with a version containing a string with today's date when I do go mod tidy for the provisioning package after the initial go mod init for provisioning. 🤔
Then after I do go mod tidy for the main oran-o2ims package, the main go.mod gets updated to the same hardware manager version.
Not sure what the best approach would be here. Any advice?

@@ -41,7 +41,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"

hwv1alpha1 "github.com/openshift-kni/oran-o2ims/api/hardwaremanagement/v1alpha1"
oranv1alpha1 "github.com/openshift-kni/oran-o2ims/api/v1alpha1"
oranv1alpha1prov "github.com/openshift-kni/oran-o2ims/api/provisioning/v1alpha1"
Copy link
Collaborator

Choose a reason for hiding this comment

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

provv1alpha1 or provisioningv1alpha1 would be more consistent with other imports, with the version as the suffix

@@ -30,7 +30,7 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
k8sptr "k8s.io/utils/ptr"

oranv1alpha1 "github.com/openshift-kni/oran-o2ims/api/v1alpha1"
oranv1alpha1inv "github.com/openshift-kni/oran-o2ims/api/inventory/v1alpha1"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same comment as above for import name format, with version as a suffix

Description:
- update the API group to o2ims.provisioning.oran.org for
  ClusterRequest and ClusterTemplate
- move ClusterRequest and ClusterTemplate APIs to their own
  directory and go module
- move the Inventory API to its own directory and go module
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.

3 participants