🐛 Fix panic on delete before cluster is initialised #1657
Conversation
k8s-ci-robot
added
the
do-not-merge/hold
✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mdbooth 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
k8s-ci-robot
added
the
size/XS
|
/test pull-cluster-api-provider-openstack-e2e-full-test This is an attempt to see if anything in #1626 specifically broke test-full. |
|
/test pull-cluster-api-provider-openstack-e2e-full-test |
|
@mdbooth: 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. |
|
I think this is good to go, btw. The full test isn't relevant here, I was just using it to test the test itself (which confirmed it is broken). |
| @@ -492,9 +492,9 @@ func machineToInstanceSpec(openStackCluster *infrav1.OpenStackCluster, machine * | |||
| instanceSpec.SecurityGroups = openStackMachine.Spec.SecurityGroups | |||
| if openStackCluster.Spec.ManagedSecurityGroups { | |||
| var managedSecurityGroup string | |||
| if util.IsControlPlaneMachine(machine) { | |||
| if util.IsControlPlaneMachine(machine) && openStackCluster.Status.ControlPlaneSecurityGroup != nil { | |||
There was a problem hiding this comment.
femtonit: I'd probably have gone with nested if statements, just to clarify that this is the block where all controller-related $things happen. As it stands, this is now the block where all controller-related $things happen if ControlPlaneSecurityGroup is set. The below conditional ensures we won't go into that block if if this is not set but it takes a sec
k8s-ci-robot
added
the
lgtm
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
Fixes #1654
/hold