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.

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

Azure Stack separate assets #96

Merged
merged 3 commits into from Jul 29, 2021

Conversation

lobziik
Copy link
Contributor

@lobziik lobziik commented Jul 19, 2021

There is plenty of changes between public Azure and Stack one. With current substitution approach it is not convenient to handle it. Extracted to separate module.

Copy link
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

I think we can simplify this a bit, please see my comments below

@@ -16,16 +17,23 @@ import (
// changes in their spec. However you can extend any resource spec with
// values not specified in the provided source resource. These changes
// would be preserved.
func GetResources(platform configv1.PlatformType) []client.Object {
func GetResources(platform configv1.PlatformType, platformStatus *configv1.PlatformStatus) []client.Object {
Copy link
Contributor

Choose a reason for hiding this comment

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

platform comes from platformStatus, we don't need to path both in explicitly, let's simplify this

Suggested change
func GetResources(platform configv1.PlatformType, platformStatus *configv1.PlatformStatus) []client.Object {
func GetResources(platformStatus *configv1.PlatformStatus) []client.Object {

@@ -140,7 +140,7 @@ func (r *CloudOperatorReconciler) Reconcile(ctx context.Context, _ ctrl.Request)
return ctrl.Result{}, err
}

if err := r.sync(ctx, config); err != nil {
if err := r.sync(ctx, config, infra.Status.PlatformStatus); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Could add the PlatformStatus to the config to replace the platform type there?

@lobziik lobziik requested a review from JoelSpeed July 22, 2021 15:54
@JoelSpeed
Copy link
Contributor

/approve
/retest

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 23, 2021
utilruntime.Must(err)
}

// GetResources returns a list of AWS resources for provisioning CCM in running cluster

Choose a reason for hiding this comment

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

Suggested change
// GetResources returns a list of AWS resources for provisioning CCM in running cluster
// GetResources returns a list of Azure resources for provisioning CCM in running cluster

Copy link
Contributor

@Fedosin Fedosin left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 23, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Fedosin, 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-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

7 similar comments
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@lobziik
Copy link
Contributor Author

lobziik commented Jul 26, 2021

/test e2e-azure-ccm

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@lobziik
Copy link
Contributor Author

lobziik commented Jul 26, 2021

/test e2e-azure-ccm

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

4 similar comments
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@JoelSpeed
Copy link
Contributor

We are aware that the tests are not currently passing because of a relatively major bug in the Azure CCM when running on OpenShift (this is to do with how openshift is deployed on Azure). We believe we have a working solution, and at this point believe this PR is correct.

We will continue to work on the bugs over the next few days and hope to have the Azure/ASH CCM stable by the end of next week.

/override ci/prow/e2e-azure-ccm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 28, 2021

@JoelSpeed: Overrode contexts on behalf of JoelSpeed: ci/prow/e2e-azure-ccm

In response to this:

We are aware that the tests are not currently passing because of a relatively major bug in the Azure CCM when running on OpenShift (this is to do with how openshift is deployed on Azure). We believe we have a working solution, and at this point believe this PR is correct.

We will continue to work on the bugs over the next few days and hope to have the Azure/ASH CCM stable by the end of next week.

/override ci/prow/e2e-azure-ccm

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.

@sdodson
Copy link
Member

sdodson commented Jul 29, 2021

Accepting this feature PR after feature freeze because this is the last critical piece in delivering an urgent feature. The work was done but delayed due to a strong desire to test more thoroughly and coordinate with other teams. Overriding bugzilla/valid-bug label.

@sdodson sdodson added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jul 29, 2021
@sdodson
Copy link
Member

sdodson commented Jul 29, 2021

/retest-required

@openshift-merge-robot openshift-merge-robot merged commit 618065c into openshift:master Jul 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants