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.

Sign up for GitHub

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

Jump to bottom

OSASINFRA-3685: openstack: tag CAPI resources with InfraID #5262

Merged
merged 1 commit into from
Dec 15, 2024
Merged

OSASINFRA-3685: openstack: tag CAPI resources with InfraID #5262

merged 1 commit into from
Dec 15, 2024

Conversation

EmilienM
Copy link
Member

@EmilienM EmilienM commented Dec 9, 2024

What this PR does / why we need it:
By default, OpenStack resources created by CAPI will be tagged (in the
OpenStack way) with openshiftClusterID=<infraID>.

openshiftClusterID is a well-known tag prefix in ShiftOnStack IPI.

Additional tags can be added via the HostedCluster.Spec.Platform.OpenStack.Tags field
when creating the HostedCluster with a given YAML file.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 9, 2024 •
edited by openshift-ci bot
Loading

@EmilienM: This pull request references OSASINFRA-3685 which is a valid jira issue.

In response to this:

What this PR does / why we need it:
By default, OpenStack resources created by CAPI will be tagged (in the
OpenStack way) with openshiftClusterID=<infraID>.

openshiftClusterID is a well-known tag prefix in ShiftOnStack IPI.

Additional tags can be added via the HostedCluster.Spec.Platform.OpenStack.Tags field
when creating the HostedCluster with a given YAML file.

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.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 9, 2024
@openshift-ci openshift-ci bot requested review from csrwng and hasueki December 9, 2024 19:44
@openshift-ci openshift-ci bot added area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release and removed do-not-merge/needs-area labels Dec 9, 2024
csrwng
csrwng reviewed Dec 9, 2024
View reviewed changes
Copy link
Contributor

@csrwng csrwng left a comment

Choose a reason for hiding this comment

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

Just one nit, otherwise lgtm

hypershift-operator/controllers/hostedcluster/internal/platform/openstack/openstack.go Outdated Show resolved Hide resolved
@EmilienM
OSASINFRA-3685: openstack: tag CAPI resources with InfraID
bba8234 
By default, OpenStack resources created by CAPI will be tagged (in the
OpenStack way) with `openshiftClusterID=<infraID>`.

`openshiftClusterID` is a well-known tag prefix in ShiftOnStack IPI.

Additional tags can be added via the `HostedCluster.Spec.Platform.OpenStack.Tags` field
when creating the HostedCluster with a given YAML file.
@EmilienM EmilienM requested a review from csrwng December 9, 2024 20:47
@csrwng
Copy link
Contributor

csrwng commented Dec 9, 2024

/approve

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 9, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, EmilienM

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2024
@mdbooth
Copy link
Contributor

mdbooth commented Dec 10, 2024

/lgtm

Users will appreciate this.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 10, 2024
@EmilienM
Copy link
Member Author

/test hypershift-operator-main-on-pull-request

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 11, 2024

@EmilienM: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-aws

/test e2e-aws-4-18

/test e2e-aws-upgrade-hypershift-operator

/test e2e-kubevirt-aws-ovn-reduced

/test images

/test security

/test unit

/test verify

The following commands are available to trigger optional jobs:

/test e2e-aks

/test e2e-aws-metrics

/test e2e-azure-aks-ovn-conformance

/test e2e-conformance

/test e2e-kubevirt-aws-ovn

/test e2e-kubevirt-azure-ovn

/test e2e-kubevirt-metal-conformance

/test e2e-openstack-aws

/test e2e-openstack-aws-conformance

/test e2e-openstack-aws-csi-cinder

/test e2e-openstack-aws-csi-manila

/test e2e-openstack-aws-nfv

/test okd-scos-e2e-aws-ovn

/test okd-scos-images

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-hypershift-main-e2e-aws

pull-ci-openshift-hypershift-main-e2e-aws-4-18

pull-ci-openshift-hypershift-main-e2e-aws-upgrade-hypershift-operator

pull-ci-openshift-hypershift-main-e2e-kubevirt-aws-ovn-reduced

pull-ci-openshift-hypershift-main-images

pull-ci-openshift-hypershift-main-okd-scos-e2e-aws-ovn

pull-ci-openshift-hypershift-main-security

pull-ci-openshift-hypershift-main-unit

pull-ci-openshift-hypershift-main-verify

In response to this:

/test hypershift-operator-main-on-pull-request

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-sigs/prow repository.

@bryan-cox
Copy link
Member

/retest

1 similar comment
@bryan-cox
Copy link
Member

/retest

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD dc7bd65 and 2 for PR HEAD bba8234 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 618a614 and 1 for PR HEAD bba8234 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 3866eeb and 0 for PR HEAD bba8234 in total

@openshift-ci-robot
Copy link

/hold

Revision bba8234 was retested 3 times: holding

@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 Dec 13, 2024
@bryan-cox
Copy link
Member

/retest

@EmilienM
Copy link
Member Author

/hold cancel

@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 Dec 15, 2024
@EmilienM
Copy link
Member Author

/retest

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 15, 2024

@EmilienM: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn bba8234 link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit ba6cf38 into openshift:main Dec 15, 2024
13 of 14 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: hypershift
This PR has been included in build ose-hypershift-container-v4.19.0-202412160113.p0.gba6cf38.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hasueki hasueki Awaiting requested review from hasueki

@csrwng csrwng Awaiting requested review from csrwng

Assignees

@mdbooth mdbooth

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@EmilienM @openshift-ci-robot @csrwng @mdbooth @bryan-cox @openshift-bot