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

[release-4.14] OCPBUGS-26548: Adds CloudConfigTransformer for Azure #321

Merged
merged 4 commits into from Jan 12, 2024
Merged

[release-4.14] OCPBUGS-26548: Adds CloudConfigTransformer for Azure #321

merged 4 commits into from Jan 12, 2024

Conversation

theobarberbany
Copy link
Contributor

No description provided.

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jan 10, 2024
@openshift-ci-robot
Copy link

@theobarberbany: This pull request references Jira Issue OCPBUGS-26548, 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.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-26210 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-26210 targets the "4.15.0" version, which is one of the valid target versions: 4.15.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.

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 theobarberbany force-pushed the tb/OCPBUGS-25483-4.14 branch 2 times, most recently from c0e665f to 88dfecb Compare January 10, 2024 14:56
JoelSpeed
JoelSpeed reviewed Jan 10, 2024
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@theobarberbany theobarberbany force-pushed the tb/OCPBUGS-25483-4.14 branch 2 times, most recently from 4511952 to 42bad40 Compare January 10, 2024 17:20
elmiko and others added 4 commits January 10, 2024 17:49
@elmiko @theobarberbany
update return values from GetCloudConfigTransformer
d7bc95c 
This change adds a boolean return value to the GetCloudConfigTransformer
function to indicate when a the cloud config ConfigMap should be looked
up from the CCO namespace. It is being added so that we can return a
config transformer and also be able to lookup the default values from
the CCO. This is primarily to address OCPBUGS-20213 which requires an
updated config on Azure Stack Hub.
@elmiko @theobarberbany
add a cloud config transformer for azure stack
f295fc5 
This change creates a CloudConfigTransformer for Azure Stack cloud
provider. The transformer will unmarshal json from the cloud config into
a `Config` struct from the azure cloud provider and then update the the
`VMType` field if it is unset. This is being added because Azure has
updated the default vm type to value that cannot be added to the basic
load balancers which are associated with Azure Stack.

The change also adds a test suite to accompany the transformer.
@theobarberbany
Adds CloudConfigTransformer for Azure
41cee54 
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 also 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.
@theobarberbany
Adds cloud-provider-azure dep
ebb9993
@theobarberbany
Copy link
Contributor Author

/retest

1 similar comment
@theobarberbany
Copy link
Contributor Author

/retest

@JoelSpeed
Copy link
Contributor

/approve
/lgtm
/label backport-risk-assessed

@openshift-ci 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 11, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 11, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 11, 2024

[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

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 Jan 11, 2024
@sunzhaohua2
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 12, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD c10ac37 and 2 for PR HEAD ebb9993 in total

@sdodson
Copy link
Member

sdodson commented Jan 12, 2024

/override ci/prow/e2e-alibaba-ovn

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 12, 2024

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-alibaba-ovn

In response to this:

/override ci/prow/e2e-alibaba-ovn

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 OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 12, 2024

@theobarberbany: 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-vsphere-ovn ebb9993 link false /test e2e-vsphere-ovn
ci/prow/e2e-alibaba-ovn ebb9993 link true /test e2e-alibaba-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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 33a706e into openshift:release-4.14 Jan 12, 2024
15 of 16 checks passed
@openshift-ci-robot
Copy link

@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.

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-bot
Copy link

[ART PR BUILD NOTIFIER]

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

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.14.0-0.nightly-2024-01-13-053216

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

@JoelSpeed JoelSpeed JoelSpeed left review comments

@sunzhaohua2 sunzhaohua2 Awaiting requested review from sunzhaohua2

@RadekManak RadekManak Awaiting requested review from RadekManak

Assignees

@jhou1 jhou1

@JoelSpeed JoelSpeed

@sunzhaohua2 sunzhaohua2

@miyadav miyadav

@huali9 huali9

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.

None yet