From 185fb9bf896fe8bf8e0adfaa0f538e7529bd3bf8 Mon Sep 17 00:00:00 2001 From: Matthew Christopher Date: Fri, 26 Jun 2020 13:21:40 -0700 Subject: [PATCH] PR feedback --- .../azuresqlserver/azuresqlserver_reconcile.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkg/resourcemanager/azuresql/azuresqlserver/azuresqlserver_reconcile.go b/pkg/resourcemanager/azuresql/azuresqlserver/azuresqlserver_reconcile.go index 036aad00c86..c5f62d1d358 100644 --- a/pkg/resourcemanager/azuresql/azuresqlserver/azuresqlserver_reconcile.go +++ b/pkg/resourcemanager/azuresql/azuresqlserver/azuresqlserver_reconcile.go @@ -122,19 +122,6 @@ func (s *AzureSqlServerManager) Ensure(ctx context.Context, obj runtime.Object, if instance.Status.Provisioning || (!specHashWasEmpty && instance.Status.SpecHash == hash) { - // TODO: This is a bit of a hack because really this check should be in the SDK. - // TODO: See: https://github.com/Azure/azure-sdk-for-go/issues/10712 - // Note that this can really only happen due to bad state in etcd because the - // CRD for the resource requires this field. Bad state in etcd can be caused by - // something like conversion webhooks being disabled and using a non-storage - // version of the CRD. This is really just a nice-to-have error to make it clear - // what the problem is for that rare case, which primarily can happen while - // we are testing locally. - if instance.Spec.ResourceGroup == "" { - instance.Status.Message = "A non-empty resource group must be specified." - return false, nil - } - serv, err := s.GetServer(ctx, instance.Spec.ResourceGroup, instance.Name) if err != nil { azerr := errhelp.NewAzureErrorAzureError(err)