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

Fix parameters used to reconcile the ignition server #2006

Merged
merged 2 commits into from
Jan 10, 2023

Conversation

KodieGlosserIBM
Copy link
Contributor

parameters were being passed in the wrong order.

Healthz handler should be the 7th parameter and managementClusterHasCapabilitySecurityContextConstraint be the 9th as seen here: https://github.com/openshift/hypershift/blob/release-4.11/control-plane-operator/controllers/hostedcontrolplane/ignitionserver/ignitionserver.go#L41

Hypershift operator is doing it correctly:

defaultIngressDomain,
ignitionServerHasHealthzHandler,
r.ReleaseProvider.GetRegistryOverrides(),
r.ManagementClusterCapabilities.Has(capabilities.CapabilitySecurityContextConstraint),

What this PR does / why we need it:
Fixing parameters being passed to reconcile the ignition server.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #

parameters were being passed in the wrong order.

Healthz handler should be the 7th parameter and managementClusterHasCapabilitySecurityContextConstraint be the 9th as seen here: https://github.com/openshift/hypershift/blob/release-4.11/control-plane-operator/controllers/hostedcontrolplane/ignitionserver/ignitionserver.go#L41
@openshift-ci openshift-ci bot requested review from csrwng and enxebre January 6, 2023 22:48
@relyt0925
Copy link
Contributor

/lgtm
/retest

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2023
@relyt0925
Copy link
Contributor

/approve

@enxebre
Copy link
Member

enxebre commented Jan 9, 2023

Thanks!

/test verify
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 9, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre, KodieGlosserIBM, relyt0925

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 9, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 923f330 and 2 for PR HEAD 78bdc37 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD c8d1297 and 1 for PR HEAD 78bdc37 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 43cd8fa and 0 for PR HEAD 78bdc37 in total

@openshift-ci-robot
Copy link

/hold

Revision 78bdc37 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 Jan 9, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2023
@sjenning
Copy link
Contributor

/label tide/merge-method-squash

@openshift-ci openshift-ci bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jan 10, 2023
@KodieGlosserIBM
Copy link
Contributor Author

/test e2e-aws

@sjenning
Copy link
Contributor

/hold
route53 rate limiting is jamming everything up and need to get #2018 to fix it

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 10, 2023

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

@relyt0925
Copy link
Contributor

/unhold

@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 Jan 10, 2023
@relyt0925
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2023
@openshift-merge-robot openshift-merge-robot merged commit 3b942b3 into openshift:main Jan 10, 2023
@KodieGlosserIBM
Copy link
Contributor Author

/cherry-pick release-4.11

@openshift-cherrypick-robot

@KodieGlosserIBM: #2006 failed to apply on top of branch "release-4.11":

Applying: Update hostedcontrolplane_controller.go
.git/rebase-apply/patch:19: trailing whitespace.
		true,		
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.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 Update hostedcontrolplane_controller.go
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".

In response to this:

/cherry-pick release-4.11

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.

KodieGlosserIBM added a commit to KodieGlosserIBM/hypershift that referenced this pull request Jan 12, 2023
@openshift-ci openshift-ci bot mentioned this pull request Jan 12, 2023
4 tasks
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. lgtm Indicates that a PR is ready to be merged. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants