[release-4.15] OCPBUGS-26210: Adds CloudConfigTransformer for Azure #319

theobarberbany · 2024-01-05T12:36:24Z

No description provided.

openshift-ci-robot · 2024-01-05T12:36:30Z

@theobarberbany: This pull request references Jira Issue OCPBUGS-26210, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.15.0) matches configured target version for branch (4.15.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-25483 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-25483 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
bug has dependents

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

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.

This adds a CloudConfigTransformer for Azure that will set the VMType to 'standard' if unset. See openshift#291, OCPBUGS-25483 and OCPBUGS-20213 for more information.

This change adds the functionality from the cluster-config-operator azure CloudConfigTransformer. The functionality we bring over is: 1. Ensure that the Cloud is set in the cloud.conf i. If it is set, verify that it is valid and does not conflict with the infrastructure config. If it conflicts, we want to error ii. If it is not set, default to public cloud (configv1.AzurePublicCloud) 2. Verify the cloud name set in the infra config is valid, if it is not bail with an informative error See openshift/cluster-config-operator#133 for the PR that initially added this functionality.

Adds tests for the vmType transformations.

This change stops the tests from segfaulting, as the new config transformer for Azure expects a PlatformStatus to be set.

This changes the tests to work with valid JSON as it is now a requirement of the azure transformer.

This adds the tests from the CCO: https://github.com/openshift/cluster-config-operator/blob/master/pkg/operator/kube_cloud_config/azure_test.go which is where we have pulled the new functionality from.

`map[T]struct{}` is more efficient than `map[T]bool`

This ensures that the list validAzureCloudNameValues is in a stable order, making testing a lot more straight forward

This change uses the sort package, rather than the slices one that does not exist in go 1.20.

JoelSpeed · 2024-01-05T12:39:43Z

/approve
/lgtm
/label backport-risk-assessed

openshift-ci · 2024-01-05T12:40:47Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [JoelSpeed]

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

sdodson · 2024-01-05T16:20:00Z

Setting cherry-pick-release in hopes of getting us into 4.14 no later than next Wednesday.

openshift-ci-robot · 2024-01-05T16:24:38Z

@theobarberbany: Jira Issue OCPBUGS-26210: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

openshift/cluster-cloud-controller-manager-operator#317 is open

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-26210 has not been moved to the MODIFIED state.

Details

In response to this:

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 · 2024-01-05T16:25:05Z

@theobarberbany: 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/e2e-azure-ovn	`02326aa`	link	false	`/test e2e-azure-ovn`

Full PR test history. Your PR dashboard.

Details

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

openshift-bot · 2024-01-05T17:17:21Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-cloud-controller-manager-operator-container-v4.15.0-202401051651.p0.ga280063.assembly.stream for distgit ose-cluster-cloud-controller-manager-operator.
All builds following this will include this PR.

sdodson · 2024-01-09T16:35:15Z

/cherry-pick release-4.14

openshift-cherrypick-robot · 2024-01-09T16:36:01Z

@sdodson: #319 failed to apply on top of branch "release-4.14":

Applying: Adds CloudConfigTransformer for Azure
Using index info to reconstruct a base tree...
M	pkg/cloud/cloud.go
M	pkg/controllers/cloud_config_sync_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controllers/cloud_config_sync_controller_test.go
Auto-merging pkg/cloud/cloud.go
CONFLICT (content): Merge conflict in pkg/cloud/cloud.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 Adds CloudConfigTransformer for Azure
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".

Details

In response to this:

/cherry-pick release-4.14

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.

theobarberbany · 2024-01-09T17:42:22Z

/jira cherrypick OCPBUGS-26210

openshift-ci-robot · 2024-01-09T17:42:29Z

@theobarberbany: Jira Issue OCPBUGS-26210 has been cloned as Jira Issue OCPBUGS-26548. Will retitle bug to link to clone.
/retitle OCPBUGS-26548: [release-4.15] OCPBUGS-26210: Adds CloudConfigTransformer for Azure

Details

In response to this:

/jira cherrypick OCPBUGS-26210

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 · 2024-01-09T17:43:04Z

@theobarberbany: Jira Issue OCPBUGS-26548: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-26548 has been moved to the MODIFIED state.

Details

In response to this:

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.

theobarberbany · 2024-01-09T17:43:27Z

/retitle [release-4.15] OCPBUGS-26210: Adds CloudConfigTransformer for Azure

openshift-ci-robot · 2024-01-09T17:44:42Z

@theobarberbany: Jira Issue OCPBUGS-26210 is in an unrecognized state (Verified) and will not be moved to the MODIFIED state.

Details

In response to this:

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 bot requested review from RadekManak, nrb and sunzhaohua2 January 5, 2024 12:36

theobarberbany added 10 commits January 5, 2024 12:37

Adds CloudConfigTransformer for Azure

4cf60d9

This adds a CloudConfigTransformer for Azure that will set the VMType to 'standard' if unset. See openshift#291, OCPBUGS-25483 and OCPBUGS-20213 for more information.

Adds vmType tests for Azure CloudConfigTransformer

e6a8345

Adds tests for the vmType transformations.

Updates tests to return Azure PlatformStatus

0f959bf

This change stops the tests from segfaulting, as the new config transformer for Azure expects a PlatformStatus to be set.

Fixes tests to provide valid JSON

d1fc739

This changes the tests to work with valid JSON as it is now a requirement of the azure transformer.

Updates comments

033dd7c

Adds cloud field tests for Azure CloudConfigTransformer

24f9d70

This adds the tests from the CCO: https://github.com/openshift/cluster-config-operator/blob/master/pkg/operator/kube_cloud_config/azure_test.go which is where we have pulled the new functionality from.

validAzureCloudNames: use map[T]struct{}

b687e5f

`map[T]struct{}` is more efficient than `map[T]bool`

Return sorted validAzureCloudNameValues

cf018b4

This ensures that the list validAzureCloudNameValues is in a stable order, making testing a lot more straight forward

Uses sort package in Azure ConfigTransformer

02326aa

This change uses the sort package, rather than the slices one that does not exist in go 1.20.

theobarberbany force-pushed the tb/OCPBUGS-25483-4.15 branch from 80868f0 to 02326aa Compare January 5, 2024 12:37

theobarberbany mentioned this pull request Jan 5, 2024

[release-4.15] OCPBUGS-26210: Adds CloudConfigTransformer for Azure #317

Closed

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 5, 2024

openshift-ci bot assigned huali9, jhou1, miyadav, sunzhaohua2 and JoelSpeed Jan 5, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 5, 2024

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 5, 2024

sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 5, 2024

openshift-merge-bot bot merged commit a280063 into openshift:release-4.15 Jan 5, 2024

openshift-ci bot changed the title ~~[release-4.15] OCPBUGS-26210: Adds CloudConfigTransformer for Azure~~ OCPBUGS-26548: [release-4.15] OCPBUGS-26210: Adds CloudConfigTransformer for Azure Jan 9, 2024

openshift-ci bot changed the title ~~OCPBUGS-26548: [release-4.15] OCPBUGS-26210: Adds CloudConfigTransformer for Azure~~ [release-4.15] OCPBUGS-26210: Adds CloudConfigTransformer for Azure Jan 9, 2024

[release-4.15] OCPBUGS-26210: Adds CloudConfigTransformer for Azure #319

[release-4.15] OCPBUGS-26210: Adds CloudConfigTransformer for Azure #319

Uh oh!

Conversation

theobarberbany commented Jan 5, 2024

Uh oh!

openshift-ci-robot commented Jan 5, 2024

Uh oh!

JoelSpeed commented Jan 5, 2024

Uh oh!

openshift-ci bot commented Jan 5, 2024

Uh oh!

sdodson commented Jan 5, 2024

Uh oh!

openshift-ci-robot commented Jan 5, 2024

Uh oh!

openshift-ci bot commented Jan 5, 2024

Uh oh!

openshift-bot commented Jan 5, 2024

Uh oh!

sdodson commented Jan 9, 2024

Uh oh!

openshift-cherrypick-robot commented Jan 9, 2024

Uh oh!

theobarberbany commented Jan 9, 2024

Uh oh!

openshift-ci-robot commented Jan 9, 2024

Uh oh!

openshift-ci-robot commented Jan 9, 2024

Uh oh!

theobarberbany commented Jan 9, 2024

Uh oh!

openshift-ci-robot commented Jan 9, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants