File tree Expand file tree Collapse file tree 3 files changed +371
-11
lines changed
cloud/services/networking Expand file tree Collapse file tree 3 files changed +371
-11
lines changed Original file line number Diff line number Diff line change @@ -25,6 +25,7 @@ import (
25
25
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/external"
26
26
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks"
27
27
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets"
28
+ "k8s.io/apimachinery/pkg/api/equality"
28
29
"k8s.io/utils/ptr"
29
30
30
31
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
@@ -258,16 +259,11 @@ func (s *Service) updateSubnetDNSNameservers(openStackCluster *infrav1.OpenStack
258
259
desiredNameservers := openStackCluster .Spec .ManagedSubnets [0 ].DNSNameservers
259
260
currentNameservers := subnet .DNSNameservers
260
261
261
- needsUpdate := false
262
+ var needsUpdate bool
262
263
if len (desiredNameservers ) != len (currentNameservers ) {
263
264
needsUpdate = true
264
265
} else {
265
- for i , ns := range desiredNameservers {
266
- if i >= len (currentNameservers ) || ns != currentNameservers [i ] {
267
- needsUpdate = true
268
- break
269
- }
270
- }
266
+ needsUpdate = ! equality .Semantic .DeepEqual (currentNameservers , desiredNameservers )
271
267
}
272
268
273
269
if needsUpdate {
You can’t perform that action at this time.
0 commit comments