Merge branch 'master' of https://github.com/Azure/azure-service-operator

into issue#858
Azure · Apr 8, 2020 · c15eaba · c15eaba
2 parents 12c04f3 + d5ef4cd
commit c15eaba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/pkg/errhelp/errors.go b/pkg/errhelp/errors.go
@@ -52,6 +52,7 @@ const (
 	SecretNotFound                      = "SecretNotFound"
 	RequestDisallowedByPolicy           = "RequestDisallowedByPolicy"
 	ServiceBusy                         = "ServiceBusy"
+	NameNotAvailable                    = "NameNotAvailable"
 )
 
 func NewAzureError(err error) error {

diff --git a/pkg/resourcemanager/rediscaches/rediscache_reconcile.go b/pkg/resourcemanager/rediscaches/rediscache_reconcile.go
@@ -81,6 +81,7 @@ func (rc *AzureRedisCacheManager) Ensure(ctx context.Context, obj runtime.Object
 			errhelp.ParentNotFoundErrorCode,
 			errhelp.ResourceGroupNotFoundErrorCode,
 			errhelp.NotFoundErrorCode,
+			errhelp.NameNotAvailable,
 		}
 
 		// handle the error

diff --git a/pkg/resourcemanager/rediscaches/rediscaches.go b/pkg/resourcemanager/rediscaches/rediscaches.go
@@ -12,6 +12,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis"
 	model "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis"
 	azurev1alpha1 "github.com/Azure/azure-service-operator/api/v1alpha1"
+	"github.com/Azure/azure-service-operator/pkg/helpers"
 	"github.com/Azure/azure-service-operator/pkg/resourcemanager/config"
 	"github.com/Azure/azure-service-operator/pkg/resourcemanager/iam"
 	"github.com/Azure/azure-service-operator/pkg/secrets"
@@ -54,11 +55,7 @@ func (r *AzureRedisCacheManager) CreateRedisCache(
 	props := instance.Spec.Properties
 
 	// convert kube labels to expected tag format
-	tags := map[string]*string{}
-	for k, v := range instance.GetLabels() {
-		value := v
-		tags[k] = &value
-	}
+	tags := helpers.LabelsToTags(instance.GetLabels())
 
 	redisClient, err := getRedisCacheClient()
 	if err != nil {