🐛 KCP: fix problem in rollout detection logic when ClusterConfiguration is nil #3356
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
k8s-ci-robot
added
the
size/S
controlplane/kubeadm/internal/machinefilters/machine_filters.go
Outdated
Show resolved
Hide resolved
controlplane/kubeadm/internal/machinefilters/machine_filters.go
Outdated
Show resolved
Hide resolved
fabriziopandini
force-pushed
the
fix-matchClusterConfiguration
branch
from
6d9699a to
a75ad0e
Compare
controlplane/kubeadm/internal/machinefilters/machine_filters.go
Outdated
Show resolved
Hide resolved
vincepri
force-pushed
the
fix-matchClusterConfiguration
branch
from
f879867 to
bb05bd2
Compare
|
@detiber PTAL |
k8s-ci-robot
added
size/M
| if !ok { | ||
| // We don't have enough information to make a decision; don't' trigger a roll out. | ||
| return true | ||
| } |
There was a problem hiding this comment.
Flipped this to improve readability
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ncdc 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 |
k8s-ci-robot
added
the
approved
|
@fabriziopandini: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. 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. |
|
/test pull-cluster-api-e2e |
What this PR does / why we need it:
Fix a problem that arises when KCP does not have a clusterConfiguration set, because we do a comparison of a cached version of the clusterConfiguration stored in a Machine annotation with the current clusterConfiguration.
In this case the Machine has "null" as the value of the annotation, since the clusterConfiguration was nil. When this gets unmarshaled and compared with nil it returns false :-(
Which issue(s) this PR fixes:
Fixes #3353