HOSTEDCP-1813: Moves MachineIdentity from the HostedCluster API to the NodePool API

bryan-cox commented 1 month ago

What this PR does / why we need it: Moves MachineIdentity from the Azure section in the HostedCluster API to the Azure section in the NodePool API

Which issue(s) this PR fixes: Fixes HOSTEDCP-1813

Checklist

[x] Subject and description added to both, commit and PR.
[x] Relevant issues have been referenced.
[ ] This change includes docs.
[x] This change includes unit tests.

openshift-ci-robot commented 1 month ago

@bryan-cox: This pull request references HOSTEDCP-1813 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.17.0" version, but no target version was set.

In response to [this](https://github.com/openshift/hypershift/pull/4408): >**What this PR does / why we need it**: >Moves `MachineIdentity` from the Azure section in the HostedCluster API to the Azure section in the NodePool API > >**Which issue(s) this PR fixes**: >Fixes [HOSTEDCP-1813](https://issues.redhat.com/browse/HOSTEDCP-1813) > >**Checklist** >- [x] Subject and description added to both, commit and PR. >- [x] Relevant issues have been referenced. >- [ ] This change includes docs. >- [x] This change includes unit tests. Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fhypershift). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.

openshift-ci[bot] commented 1 month ago

Skipping CI for Draft Pull Request. If you want CI signal for your change, please convert it to an actual PR. You can still manually trigger a test run with /test all

openshift-ci[bot] commented 1 month ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox

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: - ~~[OWNERS](https://github.com/openshift/hypershift/blob/main/OWNERS)~~ [bryan-cox] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

bryan-cox commented 1 month ago

/test all

netlify[bot] commented 1 month ago

Deploy Preview for hypershift-docs ready!

Name	Link
Latest commit	3e7bc608b1a0f04a1127449af111e6f8a3889af4
Latest deploy log	https://app.netlify.com/sites/hypershift-docs/deploys/66a12f9cb2c6c8000855b437
Deploy Preview	https://deploy-preview-4408--hypershift-docs.netlify.app
Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

bryan-cox commented 1 month ago

/retest

Patryk-Stefanski commented 1 month ago

/lgtm

Patryk-Stefanski commented 1 month ago

/lgtm

openshift-ci[bot] commented 1 month ago

@bryan-cox: The following tests 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/e2e-ibmcloud-iks	3e7bc608b1a0f04a1127449af111e6f8a3889af4	link	false	`/test e2e-ibmcloud-iks`
ci/prow/e2e-ibmcloud-roks	3e7bc608b1a0f04a1127449af111e6f8a3889af4	link	false	`/test e2e-ibmcloud-roks`
ci/prow/e2e-aks	3e7bc608b1a0f04a1127449af111e6f8a3889af4	link	false	`/test e2e-aks`
ci/prow/e2e-azure	3e7bc608b1a0f04a1127449af111e6f8a3889af4	link	false	`/test e2e-azure`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).

openshift-bot commented 1 month ago

[ART PR BUILD NOTIFIER]

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

bryan-cox commented 1 month ago

/cherry-pick release-4.16

openshift-cherrypick-robot commented 1 month ago

@bryan-cox: #4408 failed to apply on top of branch "release-4.16":

Applying: Move MachineIdentityID to Azure NP API
Using index info to reconstruct a base tree...
M   api/hypershift/v1alpha1/hostedcluster_types.go
M   api/hypershift/v1alpha1/nodepool_types.go
M   api/hypershift/v1beta1/hostedcluster_types.go
M   api/hypershift/v1beta1/nodepool_types.go
M   client/applyconfiguration/hypershift/v1alpha1/azurenodepoolplatform.go
M   client/applyconfiguration/hypershift/v1beta1/azurenodepoolplatform.go
M   cmd/install/assets/hypershift-operator/hypershift.openshift.io_hostedclusters.yaml
M   cmd/install/assets/hypershift-operator/hypershift.openshift.io_hostedcontrolplanes.yaml
M   cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml
M   docs/content/reference/api.md
M   hack/app-sre/saas_template.yaml
Falling back to patching base and 3-way merge...
Auto-merging hack/app-sre/saas_template.yaml
Auto-merging docs/content/reference/api.md
CONFLICT (content): Merge conflict in docs/content/reference/api.md
Auto-merging cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml
CONFLICT (content): Merge conflict in cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml
Auto-merging cmd/install/assets/hypershift-operator/hypershift.openshift.io_hostedcontrolplanes.yaml
Auto-merging cmd/install/assets/hypershift-operator/hypershift.openshift.io_hostedclusters.yaml
Auto-merging client/applyconfiguration/hypershift/v1beta1/azurenodepoolplatform.go
CONFLICT (content): Merge conflict in client/applyconfiguration/hypershift/v1beta1/azurenodepoolplatform.go
Auto-merging client/applyconfiguration/hypershift/v1alpha1/azurenodepoolplatform.go
CONFLICT (content): Merge conflict in client/applyconfiguration/hypershift/v1alpha1/azurenodepoolplatform.go
Auto-merging api/hypershift/v1beta1/nodepool_types.go
CONFLICT (content): Merge conflict in api/hypershift/v1beta1/nodepool_types.go
Auto-merging api/hypershift/v1beta1/hostedcluster_types.go
Auto-merging api/hypershift/v1alpha1/nodepool_types.go
CONFLICT (content): Merge conflict in api/hypershift/v1alpha1/nodepool_types.go
Auto-merging api/hypershift/v1alpha1/hostedcluster_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move MachineIdentityID to Azure NP API
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to [this](https://github.com/openshift/hypershift/pull/4408#issuecomment-2256432460): >/cherry-pick release-4.16 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.

openshift / hypershift