Skip to content

Commit 890c3cb

Browse files
authored
Merge pull request #1294 from FrancoisKlieberOrange/feature/improve_compareMasterAuthorizedNetworksConfig
fix: improve compareMasterAuthorizedNetworksConfig
2 parents c3b8b53 + f97bc9a commit 890c3cb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

cloud/services/container/clusters/reconcile.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"cloud.google.com/go/container/apiv1/containerpb"
2828
"github.com/go-logr/logr"
2929
"github.com/google/go-cmp/cmp"
30+
"github.com/google/go-cmp/cmp/cmpopts"
3031
"github.com/googleapis/gax-go/v2/apierror"
3132
"github.com/pkg/errors"
3233
"google.golang.org/grpc/codes"
@@ -473,7 +474,7 @@ func compareMasterAuthorizedNetworksConfig(a, b *containerpb.MasterAuthorizedNet
473474
if (a.CidrBlocks == nil && b.CidrBlocks != nil && len(b.GetCidrBlocks()) == 0) || (b.CidrBlocks == nil && a.CidrBlocks != nil && len(a.GetCidrBlocks()) == 0) {
474475
return true
475476
}
476-
if !cmp.Equal(a.GetCidrBlocks(), b.GetCidrBlocks()) {
477+
if !cmp.Equal(a.GetCidrBlocks(), b.GetCidrBlocks(), cmpopts.IgnoreUnexported(containerpb.MasterAuthorizedNetworksConfig_CidrBlock{})) {
477478
return false
478479
}
479480
return true

0 commit comments

Comments
 (0)