Merge pull request #1246 from MarcPow/pip-iptags

Add support for allocation of public ips with ip-tags
Azure · Jul 30, 2020 · 46752b1 · 46752b1
2 parents 85bba13 + e1b8f1a
commit 46752b1
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/api/v1alpha1/azurepublicipaddress_types.go b/api/v1alpha1/azurepublicipaddress_types.go
@@ -14,6 +14,7 @@ import (
 type AzurePublicIPAddressSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+
 	Location string `json:"location"`
 	// +kubebuilder:validation:Pattern=^[-\w\._\(\)]+$
 	// +kubebuilder:validation:MinLength:1
@@ -23,6 +24,8 @@ type AzurePublicIPAddressSpec struct {
 	IdleTimeoutInMinutes     int    `json:"idleTimeoutInMinutes"`
 	PublicIPAddressVersion   string `json:"publicIPAddressVersion"`
 	SkuName                  string `json:"skuName"`
+	// +optional
+	IPTags map[string]string `json:"ipTags,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/azurepublicipaddress_types_test.go b/api/v1alpha1/azurepublicipaddress_types_test.go
@@ -53,6 +53,7 @@ var _ = Describe("AzurePublicIPAddress", func() {
 					IdleTimeoutInMinutes:     3,
 					PublicIPAddressVersion:   "IPv4",
 					SkuName:                  "Basic",
+					IPTags:                   map[string]string{"TestIpTag": "/Test/VipPool"},
 				}}
 
 			By("creating an API obj")

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/resourcemanager/pip/client.go b/pkg/resourcemanager/pip/client.go
@@ -34,7 +34,15 @@ func getPublicIPAddressClient() vnetwork.PublicIPAddressesClient {
 	return pipClient
 }
 
-func (m *AzurePublicIPAddressClient) CreatePublicIPAddress(ctx context.Context, location string, resourceGroupName string, resourceName string, publicIPAllocationMethod string, idleTimeoutInMinutes int, publicIPAddressVersion string, skuName string) (future vnetwork.PublicIPAddressesCreateOrUpdateFuture, err error) {
+func (m *AzurePublicIPAddressClient) CreatePublicIPAddress(ctx context.Context,
+	location string,
+	resourceGroupName string,
+	resourceName string,
+	publicIPAllocationMethod string,
+	idleTimeoutInMinutes int,
+	publicIPAddressVersion string,
+	skuName string,
+	ipTags map[string]string) (future vnetwork.PublicIPAddressesCreateOrUpdateFuture, err error) {
 
 	client := getPublicIPAddressClient()
 
@@ -62,6 +70,7 @@ func (m *AzurePublicIPAddressClient) CreatePublicIPAddress(ctx context.Context,
 				PublicIPAllocationMethod: publicIPAllocationMethodField,
 				IdleTimeoutInMinutes:     &idleTimeoutInMinutesInt32,
 				PublicIPAddressVersion:   publicIPAddressVersionField,
+				IPTags:                   getIPTagsForPublicIP(ipTags),
 			},
 			Sku: &vnetwork.PublicIPAddressSku{
 				Name: skuNameInput,
@@ -72,6 +81,21 @@ func (m *AzurePublicIPAddressClient) CreatePublicIPAddress(ctx context.Context,
 	return future, err
 }
 
+func getIPTagsForPublicIP(tags map[string]string) *[]vnetwork.IPTag {
+	if tags == nil || len(tags) == 0 {
+		return nil
+	}
+
+	outputTags := []vnetwork.IPTag{}
+	for k, v := range tags {
+		outputTags = append(outputTags, vnetwork.IPTag{
+			IPTagType: &k,
+			Tag:       &v,
+		})
+	}
+	return &outputTags
+}
+
 func (m *AzurePublicIPAddressClient) DeletePublicIPAddress(ctx context.Context, publicIPAddressName string, resourcegroup string) (status string, err error) {
 
 	client := getPublicIPAddressClient()

diff --git a/pkg/resourcemanager/pip/reconcile.go b/pkg/resourcemanager/pip/reconcile.go
@@ -30,6 +30,7 @@ func (g *AzurePublicIPAddressClient) Ensure(ctx context.Context, obj runtime.Obj
 	idleTimeoutInMinutes := instance.Spec.IdleTimeoutInMinutes
 	publicIPAddressVersion := instance.Spec.PublicIPAddressVersion
 	skuName := instance.Spec.SkuName
+	ipTags := instance.Spec.IPTags
 
 	instance.Status.Provisioning = true
 	// Check if this item already exists. This is required
@@ -51,6 +52,7 @@ func (g *AzurePublicIPAddressClient) Ensure(ctx context.Context, obj runtime.Obj
 		idleTimeoutInMinutes,
 		publicIPAddressVersion,
 		skuName,
+		ipTags,
 	)
 	if err != nil {
 		// let the user know what happened