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

openshift-cherrypick-robot · 2024-01-05T03:23:51Z

This is an automated cherry-pick of #316

/assign sdodson

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

openshift-ci-robot · 2024-01-05T03:23:58Z

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

Details

In response to this:

This is an automated cherry-pick of #316

/assign sdodson

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-05T03:24:12Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-26210, which is invalid:

expected dependent Jira Issue OCPBUGS-25483 to target a version in 4.16.0, but it targets "4.16" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

In response to this:

This is an automated cherry-pick of #316

/assign sdodson

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-05T03:24:59Z

[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 assign nrb for approval. For more information see the Kubernetes Code Review Process.

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

Details

Needs approval from an approver in each of these files:

OWNERS

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-05T03:26:54Z

/cc @theobarberbany @JoelSpeed

sdodson · 2024-01-05T03:27:37Z

/jira refresh

openshift-ci-robot · 2024-01-05T03:27:43Z

@sdodson: This pull request references Jira Issue OCPBUGS-26210, which is valid. The bug has been moved to the POST state.

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 New, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-25483 is in the state MODIFIED, 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

Details

In response to this:

/jira refresh

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-05T09:37:35Z

/test unit

theobarberbany · 2024-01-05T09:38:43Z

/retest-required

openshift-ci · 2024-01-05T09:42:29Z

@openshift-cherrypick-robot: 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/unit	`2525aa4`	link	true	`/test unit`
ci/prow/e2e-vsphere-ovn	`2525aa4`	link	false	`/test e2e-vsphere-ovn`
ci/prow/lint	`2525aa4`	link	true	`/test lint`
ci/prow/e2e-aws-ovn-upgrade	`2525aa4`	link	true	`/test e2e-aws-ovn-upgrade`
ci/prow/e2e-openstack-ovn	`2525aa4`	link	false	`/test e2e-openstack-ovn`
ci/prow/e2e-alibaba-ovn	`2525aa4`	link	false	`/test e2e-alibaba-ovn`
ci/prow/images	`2525aa4`	link	true	`/test images`
ci/prow/e2e-azure-ovn-upgrade	`2525aa4`	link	false	`/test e2e-azure-ovn-upgrade`
ci/prow/e2e-aws-ovn	`2525aa4`	link	true	`/test e2e-aws-ovn`
ci/prow/e2e-gcp-ovn	`2525aa4`	link	false	`/test e2e-gcp-ovn`
ci/prow/e2e-azure-ovn	`2525aa4`	link	false	`/test e2e-azure-ovn`
ci/prow/e2e-gcp-ovn-upgrade	`2525aa4`	link	false	`/test e2e-gcp-ovn-upgrade`
ci/prow/vet	`2525aa4`	link	true	`/test vet`

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.

theobarberbany · 2024-01-05T12:38:32Z

I thinnk we should close in favour of #319. I've added a fix that uses a different sorting library that is present in go 1.20 (02326aa)

sdodson · 2024-01-05T14:00:40Z

I thinnk we should close in favour of #319. I've added a fix that uses a different sorting library that is present in go 1.20 (02326aa)

That's fine with me.
/close

sdodson · 2024-01-05T16:25:07Z

/close

openshift-ci · 2024-01-05T16:25:20Z

@sdodson: Closed this PR.

Details

In response to this:

/close

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.

openshift-ci-robot · 2024-01-05T16:25:22Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-26210. The bug has been updated to no longer refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #316

/assign sdodson

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 added 9 commits January 5, 2024 03:23

Adds CloudConfigTransformer for Azure

18439c7

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

2b747f9

Adds tests for the vmType transformations.

Updates tests to return Azure PlatformStatus

b4ccf0f

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

95eeb81

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

Updates comments

0ea3442

Adds cloud field tests for Azure CloudConfigTransformer

1ca99e2

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{}

0eb1013

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

Return sorted validAzureCloudNameValues

2525aa4

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

openshift-cherrypick-robot assigned sdodson Jan 5, 2024

openshift-cherrypick-robot mentioned this pull request Jan 5, 2024

OCPBUGS-25483: Adds CloudConfigTransformer for Azure #316

Merged

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

openshift-ci bot requested review from nrb and vincepri January 5, 2024 03:24

openshift-ci bot requested review from JoelSpeed and theobarberbany January 5, 2024 03:26

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 5, 2024

openshift-ci bot requested a review from sunzhaohua2 January 5, 2024 03:27

openshift-ci-robot mentioned this pull request Jan 5, 2024

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

Merged

openshift-ci bot closed this Jan 5, 2024

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

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

Uh oh!

Conversation

openshift-cherrypick-robot commented Jan 5, 2024

Uh oh!

openshift-ci-robot commented Jan 5, 2024

Uh oh!

openshift-ci-robot commented Jan 5, 2024

Uh oh!

openshift-ci bot commented Jan 5, 2024

Uh oh!

sdodson commented Jan 5, 2024

Uh oh!

sdodson commented Jan 5, 2024

Uh oh!

openshift-ci-robot commented Jan 5, 2024

Uh oh!

theobarberbany commented Jan 5, 2024

Uh oh!

theobarberbany commented Jan 5, 2024

Uh oh!

openshift-ci bot commented Jan 5, 2024

Uh oh!

theobarberbany commented Jan 5, 2024

Uh oh!

sdodson commented Jan 5, 2024

Uh oh!

sdodson commented Jan 5, 2024

Uh oh!

openshift-ci bot commented Jan 5, 2024

Uh oh!

openshift-ci-robot commented Jan 5, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants