Merge pull request #10553 from justinsb/fix_openstack_race

Openstack: Prevent data race in servergroup member list
kubernetes · Jan 10, 2021 · 7562336 · 7562336
2 parents 08cac10 + 2f5ba0f
commit 7562336
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 82 deletions.
diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml
@@ -58,7 +58,6 @@ ServerGroup:
   IGName: node
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-node
   Policies:
   - anti-affinity
@@ -98,7 +97,6 @@ ID: null
 IGName: node
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-node
 Policies:
 - anti-affinity
diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml
@@ -57,7 +57,6 @@ ServerGroup:
   IGName: node
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-node
   Policies:
   - anti-affinity
@@ -96,7 +95,6 @@ ID: null
 IGName: node
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-node
 Policies:
 - anti-affinity
diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml
@@ -57,7 +57,6 @@ ServerGroup:
   IGName: node
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-node
   Policies:
   - anti-affinity
@@ -96,7 +95,6 @@ ID: null
 IGName: node
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-node
 Policies:
 - anti-affinity
diff --git a/...servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml b/...servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml
@@ -113,7 +113,6 @@ ServerGroup:
   IGName: master
   Lifecycle: Sync
   MaxSize: 3
-  Members: null
   Name: cluster-master
   Policies:
   - anti-affinity
@@ -190,7 +189,6 @@ ServerGroup:
   IGName: master
   Lifecycle: Sync
   MaxSize: 3
-  Members: null
   Name: cluster-master
   Policies:
   - anti-affinity
@@ -267,7 +265,6 @@ ServerGroup:
   IGName: master
   Lifecycle: Sync
   MaxSize: 3
-  Members: null
   Name: cluster-master
   Policies:
   - anti-affinity
@@ -337,7 +334,6 @@ ServerGroup:
   IGName: node
   Lifecycle: Sync
   MaxSize: 3
-  Members: null
   Name: cluster-node
   Policies:
   - anti-affinity
@@ -407,7 +403,6 @@ ServerGroup:
   IGName: node
   Lifecycle: Sync
   MaxSize: 3
-  Members: null
   Name: cluster-node
   Policies:
   - anti-affinity
@@ -477,7 +472,6 @@ ServerGroup:
   IGName: node
   Lifecycle: Sync
   MaxSize: 3
-  Members: null
   Name: cluster-node
   Policies:
   - anti-affinity
@@ -664,7 +658,6 @@ ID: null
 IGName: master
 Lifecycle: Sync
 MaxSize: 3
-Members: null
 Name: cluster-master
 Policies:
 - anti-affinity
@@ -674,7 +667,6 @@ ID: null
 IGName: node
 Lifecycle: Sync
 MaxSize: 3
-Members: null
 Name: cluster-node
 Policies:
 - anti-affinity
diff --git a/.../servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml b/.../servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml
@@ -108,7 +108,6 @@ ServerGroup:
   IGName: master-a
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-master-a
   Policies:
   - anti-affinity
@@ -173,7 +172,6 @@ ServerGroup:
   IGName: master-b
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-master-b
   Policies:
   - anti-affinity
@@ -238,7 +236,6 @@ ServerGroup:
   IGName: master-c
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-master-c
   Policies:
   - anti-affinity
@@ -308,7 +305,6 @@ ServerGroup:
   IGName: node-a
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-node-a
   Policies:
   - anti-affinity
@@ -378,7 +374,6 @@ ServerGroup:
   IGName: node-b
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-node-b
   Policies:
   - anti-affinity
@@ -448,7 +443,6 @@ ServerGroup:
   IGName: node-c
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-node-c
   Policies:
   - anti-affinity
@@ -540,7 +534,6 @@ ServerGroup:
   IGName: master-a
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-master-a
   Policies:
   - anti-affinity
@@ -574,7 +567,6 @@ ServerGroup:
   IGName: master-b
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-master-b
   Policies:
   - anti-affinity
@@ -608,7 +600,6 @@ ServerGroup:
   IGName: master-c
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-master-c
   Policies:
   - anti-affinity
@@ -774,7 +765,6 @@ ID: null
 IGName: master-a
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-master-a
 Policies:
 - anti-affinity
@@ -784,7 +774,6 @@ ID: null
 IGName: master-b
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-master-b
 Policies:
 - anti-affinity
@@ -794,7 +783,6 @@ ID: null
 IGName: master-c
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-master-c
 Policies:
 - anti-affinity
@@ -804,7 +792,6 @@ ID: null
 IGName: node-a
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-node-a
 Policies:
 - anti-affinity
@@ -814,7 +801,6 @@ ID: null
 IGName: node-b
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-node-b
 Policies:
 - anti-affinity
@@ -824,7 +810,6 @@ ID: null
 IGName: node-c
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-node-c
 Policies:
 - anti-affinity
diff --git a/...l/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml b/...l/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml
@@ -121,7 +121,6 @@ ServerGroup:
   IGName: master-a
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-master-a
   Policies:
   - anti-affinity
@@ -198,7 +197,6 @@ ServerGroup:
   IGName: master-b
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-master-b
   Policies:
   - anti-affinity
@@ -275,7 +273,6 @@ ServerGroup:
   IGName: master-c
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-master-c
   Policies:
   - anti-affinity
@@ -345,7 +342,6 @@ ServerGroup:
   IGName: node-a
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-node-a
   Policies:
   - anti-affinity
@@ -415,7 +411,6 @@ ServerGroup:
   IGName: node-b
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-node-b
   Policies:
   - anti-affinity
@@ -485,7 +480,6 @@ ServerGroup:
   IGName: node-c
   Lifecycle: Sync
   MaxSize: 1
-  Members: null
   Name: cluster-node-c
   Policies:
   - anti-affinity
@@ -672,7 +666,6 @@ ID: null
 IGName: master-a
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-master-a
 Policies:
 - anti-affinity
@@ -682,7 +675,6 @@ ID: null
 IGName: master-b
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-master-b
 Policies:
 - anti-affinity
@@ -692,7 +684,6 @@ ID: null
 IGName: master-c
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-master-c
 Policies:
 - anti-affinity
@@ -702,7 +693,6 @@ ID: null
 IGName: node-a
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-node-a
 Policies:
 - anti-affinity
@@ -712,7 +702,6 @@ ID: null
 IGName: node-b
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-node-b
 Policies:
 - anti-affinity
@@ -722,7 +711,6 @@ ID: null
 IGName: node-c
 Lifecycle: Sync
 MaxSize: 1
-Members: null
 Name: cluster-node-c
 Policies:
 - anti-affinity