OCPBUGS-49662: Prevent resetting masquerade subnet #2641
Conversation
ovnkube running in ovnkube-control-plane need to know about masquerade subnet as it is currently configurable at day 2. If ovnkube is not aware of custom masquerade subnet, then subnet overlap check at ovnkube side during startup would consider default masquerade subnet and overlap check would be inaccurate. Signed-off-by: Arnab Ghosh <[email protected]>
Prevent resetting masquerade subnet to default value(169.254.169.0/29) set at upstream ovn-kubernetes when ovnkube-node daemonset is removed from the cluster. If masquerade subnet is configured through network.operator custom resource then it takes precedence over default masquerade subnet. Signed-off-by: Arnab Ghosh <[email protected]>
arghosh93
changed the title
openshift-ci-robot
added
jira/valid-reference
|
@arghosh93: This pull request references Jira Issue OCPBUGS-49662, which is invalid:
Comment 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. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: arghosh93 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/jira-refresh |
|
/jira refresh |
openshift-ci-robot
added
the
jira/valid-bug
|
@arghosh93: This pull request references Jira Issue OCPBUGS-49662, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: 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-ci-robot
removed
the
jira/invalid-bug
|
/retest-required |
|
/retest |
|
@arghosh93: 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. |
| @@ -1306,7 +1306,7 @@ func bootstrapOVN(conf *operv1.Network, kubeClient cnoclient.Client, infraStatus | |||
| } | |||
|
|
|||
| // set the default masquerade CIDR for new clusters while ignoring upgrades | |||
| if res.ControlPlaneUpdateStatus == nil && res.NodeUpdateStatus == nil { | |||
| if res.ControlPlaneUpdateStatus == nil || res.NodeUpdateStatus == nil { | |||
There was a problem hiding this comment.
What if someone removes both the controlplane and the dataplane components?
There was a problem hiding this comment.
If I remove both ovnkube-node DS and ovnkube-control-plane deployment then also masquerade subnet does not get reverted back to old default subnets.
Do you anticipate this change may override old default masquerade subnets during a upgrade? Then I would say this change is not sufficient to address the issue.
There was a problem hiding this comment.
I have tried to upgrade from one version to other(4.17-4.18) and I dont see ovnkube-node DS and ovnkube-control-plane deployment being deleted and instead all images get changed.
Prevent resetting masquerade subnet to default value(169.254.169.0/29)
set at upstream ovn-kubernetes when ovnkube-node daemonset is removed
from the cluster.
This PR have an additional commit to update masquerade subnet to
ovnkube-control-plane deployment. This is required as masquerade
subnet is currently configurable at day 2.