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

OCPBUGS-19346: set default deploymentconfig params on AWS CCM #3021

Merged
merged 1 commit into from Sep 20, 2023
Merged

OCPBUGS-19346: set default deploymentconfig params on AWS CCM #3021

merged 1 commit into from Sep 20, 2023

Conversation

sjenning
Copy link
Contributor

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 18, 2023
@openshift-ci-robot
Copy link

@sjenning: This pull request references Jira Issue OCPBUGS-19346, which is invalid:

  • expected the bug to target the "4.15.0" version, but it targets "4.14.0" 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.

In response to this:

https://issues.redhat.com/browse/OCPBUGS-19346

cc @csrwng

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 openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 18, 2023
@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-area labels Sep 18, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 18, 2023

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 openshift-ci bot added the area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release label Sep 18, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sjenning

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Sep 18, 2023
sjenning
sjenning commented Sep 18, 2023
View reviewed changes
control-plane-operator/controllers/hostedcontrolplane/cloud/aws/params.go
@@ -31,5 +35,21 @@ func NewAWSParams(hcp *hyperv1.HostedControlPlane) *AWSParams {
}
p.OwnerRef = config.ControllerOwnerRef(hcp)

p.DeploymentConfig.SetDefaults(hcp, ccmLabels(), pointer.Int(1))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the main difference. The rest is a refactor to make it more like the param/reconcile pattern in the other components.

sjenning
sjenning commented Sep 18, 2023
View reviewed changes
control-plane-operator/controllers/hostedcontrolplane/cloud/aws/params.go
}
p.DeploymentConfig.AdditionalLabels = additionalLabels()
p.DeploymentConfig.Scheduling.PriorityClass = config.DefaultPriorityClass
if hcp.Annotations[hyperv1.ControlPlanePriorityClass] != "" {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This logic was also missing.

@enxebre
Copy link
Member

enxebre commented Sep 18, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 18, 2023
@sjenning sjenning marked this pull request as ready for review September 18, 2023 16:11
@sjenning
Copy link
Contributor Author

/jira refresh

@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 18, 2023
@openshift-ci-robot 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 Sep 18, 2023
@openshift-ci-robot
Copy link

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

3 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)

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 kubernetes/test-infra repository.

@csrwng
Copy link
Contributor

csrwng commented Sep 18, 2023

Seems like an issue with CI registry:

Failed to pull image "registry.build02.ci.openshift.org/ci-op-x3vppmgy/pipeline@sha256:9154f95ec19804bb07d146f105cf329bf8a613e1bff631bd9d1057f4b099e796": rpc error: code = DeadlineExceeded desc = pinging container registry registry.build02.ci.openshift.org: Get "https://registry.build02.ci.openshift.org/v2/": dial tcp 34.74.144.21:443: i/o timeout

/retest-required

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 860064d and 2 for PR HEAD 92bfedb in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 8522cf8 and 1 for PR HEAD 92bfedb in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 4c7f043 and 0 for PR HEAD 92bfedb in total

@openshift-ci-robot
Copy link

/hold

Revision 92bfedb was retested 3 times: holding

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 19, 2023
@enxebre
Copy link
Member

enxebre commented Sep 19, 2023

/test e2e-kubevirt-aws-ovn

1 similar comment
@sjenning
Copy link
Contributor Author

/test e2e-kubevirt-aws-ovn

@sjenning
Copy link
Contributor Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 20, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 20, 2023

@sjenning: all tests passed!

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-robot openshift-merge-robot merged commit 13b15ae into openshift:main Sep 20, 2023
14 checks passed
@openshift-ci-robot
Copy link

@sjenning: Jira Issue OCPBUGS-19346: All pull requests linked via external trackers have merged:

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

In response to this:

https://issues.redhat.com/browse/OCPBUGS-19346

cc @csrwng

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.

@sjenning
Copy link
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link

@sjenning: new pull request created: #3029

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 20, 2023
Merged
@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2023-09-27-073353

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

@csrwng csrwng Awaiting requested review from csrwng

@enxebre enxebre Awaiting requested review from enxebre

Assignees

@enxebre enxebre

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release 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
6 participants
@sjenning @openshift-ci-robot @enxebre @csrwng @openshift-cherrypick-robot @openshift-merge-robot