From f97bc9a1dd9c655e662a528a51fa8dc22b3ec31c Mon Sep 17 00:00:00 2001 From: Francois Klieber Date: Thu, 25 Jul 2024 14:31:09 +0000 Subject: [PATCH] feat: improve compareMasterAuthorizedNetworksConfig --- cloud/services/container/clusters/reconcile.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cloud/services/container/clusters/reconcile.go b/cloud/services/container/clusters/reconcile.go index dfb8cfca3..cb0074d98 100644 --- a/cloud/services/container/clusters/reconcile.go +++ b/cloud/services/container/clusters/reconcile.go @@ -27,6 +27,7 @@ import ( "cloud.google.com/go/container/apiv1/containerpb" "github.com/go-logr/logr" "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" "github.com/googleapis/gax-go/v2/apierror" "github.com/pkg/errors" "google.golang.org/grpc/codes" @@ -473,7 +474,7 @@ func compareMasterAuthorizedNetworksConfig(a, b *containerpb.MasterAuthorizedNet if (a.CidrBlocks == nil && b.CidrBlocks != nil && len(b.GetCidrBlocks()) == 0) || (b.CidrBlocks == nil && a.CidrBlocks != nil && len(a.GetCidrBlocks()) == 0) { return true } - if !cmp.Equal(a.GetCidrBlocks(), b.GetCidrBlocks()) { + if !cmp.Equal(a.GetCidrBlocks(), b.GetCidrBlocks(), cmpopts.IgnoreUnexported(containerpb.MasterAuthorizedNetworksConfig_CidrBlock{})) { return false } return true