-
Notifications
You must be signed in to change notification settings - Fork 419
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
MCO-1501: Add support for custom MCPs in MCN #4876
MCO-1501: Add support for custom MCPs in MCN #4876
Conversation
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
Skipping CI for Draft Pull Request. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
/test unit |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
e1d6dd1
to
12ffd22
Compare
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: isabella-janssen 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 |
/test e2e-gcp-op-techpreview |
Verified using IPI on AWS We followed these steps
Apart from that we executed these steps too
All already existing MCN e2e tests passed too. We were able to successfully apply pinnedimagessets to a custom pool too. /label qe-approved |
@isabella-janssen: This pull request references MCO-1501 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set. 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. |
4e841c1
to
df2762b
Compare
@isabella-janssen: The following tests failed, say
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-sigs/prow repository. I understand the commands that are listed here. |
@@ -15,6 +15,8 @@ import ( | |||
"github.com/openshift/machine-config-operator/pkg/apihelpers" | |||
ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common" | |||
"github.com/openshift/machine-config-operator/pkg/daemon/constants" | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: extra line
changes LGTM |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally lgtm as well! Left 2 comments just to understand some decision reasoning, but neither are blocking and we can go ahead with the current design
@@ -102,14 +106,6 @@ func generateAndApplyMachineConfigNodes( | |||
return nil | |||
} | |||
|
|||
var pool string |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm curious as whether it would make sense to make an equivalent call for GetPrimaryPoolNameForMCN
here directly, instead of having the pool passed around multiple levels of functions. Would that be feasible technically?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried this before and agree that in an ideal world this would be a much better pattern. I had issues with the MCP listener getting passed around that's needed for the GetPrimaryPoolNameForMCN
function and, at the end of the day, figured the time commitment to debug was not worth it at this stage.
Since I still think there is value in this but do not think it is as high priority as some of the other GA work for MCN, would a fair compromise be to create a minor priority story to revisit updating this pattern when time permits?
// Handle case of nil node | ||
if node == nil { | ||
klog.Error("node object is nil, setting associated MCP to unknown") | ||
return "unknown", nil |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm generally ok with unknown
being the "pool" for an uninitialized node object, but I think we should generally be careful with introducing keywords (and the infinitesimally small chance that someone actually names a pool unknown, ha).
Is the primary reasoning here that we'd like to differentiate a "erroring" node (which would be "") and an uninitialized node (which would be "unknown")? I would also be fine with having both just be empty string as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the primary reasoning here that we'd like to differentiate a "erroring" node (which would be "") and an uninitialized node (which would be "unknown")?
Since the pool name is a required value, it cannot be empty (or ""). In any case when no pool is associated with the node, the pool is filled, temporarily, as "unknown."
I would be fine changing the placeholder value from "unknown" if there is another value that makes more sense.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm fine with this for now. This should be rare and users shouldn't really see this barring something going terribly wrong, so let's keep it as such
/lgtm Let's get this in to unblock the remaining MCN work and open a low prio card to track cleaning up the pattern. |
overriding accidentally switched on tests from the master-> main migration (not sure if this is still necessary, but just in case) /override ci/prow/4.12-upgrade-from-stable-4.11-images |
@djoshy: Overrode contexts on behalf of djoshy: ci/prow/4.12-upgrade-from-stable-4.11-images, ci/prow/cluster-bootimages, ci/prow/okd-images 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 kubernetes-sigs/prow repository. |
/retest-required |
d1d9884
into
openshift:main
Card was created: https://issues.redhat.com/browse/MCO-1610 |
- What I did
This work adds support for custom MCPs in MCN. The update makes use of the previously existing
GetPrimaryPoolForNode
function to get the pool a node is associated with.- How to verify it
Test for standard case
infra
and add a worker node to the new MCP.machineconfignode
object for theinfra
node and check that the pool name matches.machineconfignode
.Test node with multiple labels
infra
andcustom
and add one worker node to each new MCP.custom
label to the the node part of theinfra
MCP.machineconfignode
object for the node part of theinfra
pool and check that the pool name is properly populating asinfra
. Note that the node will not be a part ofcustom
, as that label was added after the node joined theinfra
pool and the node can only be a part of one MCP.machineconfignode
.infra
label from the infra node. This will force the node to become part of thecustom
MCP due to that label on the node.machineconfignode
object for the node previously part of theinfra
pool and check that the pool name is now properly populating ascustom
.machineconfignode
.Test by deleting MCP
custom
and add a worker node to the new MCP. Validate themachineconfignode
for the node in the new MCP.custom
MCP. This will force the node previously part of the pool to become part of the defaultworker
pool.machineconfignode
object for the node part previously part of thecustom
pool and check that the pool name is now properly populating asworker
.machineconfignode
.- Description for the changelog
MCO-1501: Added support for custom MCPs in MCN