Added LB rules for ucp and dtr

Signed-off-by: French Ben <[email protected]>

Author: French Ben

azure/release/files/release.py

@@ -57,8 +57,10 @@ def main():
     flat_edition_version = edition_version.replace(" ", "")
     vhd_sku = args.vhd_sku
     vhd_version = args.vhd_version
+    offer_id = args.offer_id
     cs_vhd_sku = args.cs_vhd_sku
     cs_vhd_version = args.cs_vhd_version
+    cs_offer_id = args.cs_offer_id
 
     docker_for_azure_version = u"azure-v{}".format(flat_edition_version)
     image_name = u"Moby Linux {}".format(docker_for_azure_version)
@@ -76,14 +78,14 @@ def main():
 
     print("Create CloudFormation template..")
     template_name = u"{}.json".format(docker_for_azure_version)
-    base_url = create_rg_template(vhd_sku, vhd_version, release_channel, docker_version,
+    base_url = create_rg_template(vhd_sku, vhd_version, offer_id, release_channel, docker_version,
                                  docker_for_azure_version, edition_version, CFN_TEMPLATE, template_name)
     cloud_template_name = u"{}-cloud.json".format(docker_for_azure_version)
     cloud_url = create_rg_cloud_template(release_cloud_channel, docker_version,
                                  docker_for_azure_version, edition_version, base_url, cloud_template_name)
 
     ddc_template_name = u"{}-ddc.json".format(docker_for_azure_version)
-    ddc_url = create_rg_ddc_template(cs_vhd_sku, cs_vhd_version, release_ddc_channel, docker_version,
+    ddc_url = create_rg_ddc_template(cs_vhd_sku, cs_vhd_version, cs_offer_id, release_ddc_channel, docker_version,
                                  docker_for_azure_version, edition_version, base_url, ddc_template_name)
 
     print("------------------")

azure/release/files/utils.py

@@ -73,7 +73,7 @@ def upload_rg_template(release_channel, cloudformation_template_name, tempfile,
 
     return s3_full_url
 
-def create_rg_template(vhd_sku, vhd_version, release_channel, docker_version,
+def create_rg_template(vhd_sku, vhd_version, offer_id, release_channel, docker_version,
                         docker_for_azure_version, edition_version, cfn_template, cloudformation_template_name):
     # check if file exists before opening.
     flat_edition_version = edition_version.replace(" ", "").replace("_", "").replace("-", "")
@@ -85,6 +85,7 @@ def create_rg_template(vhd_sku, vhd_version, release_channel, docker_version,
     data['variables']['Description'] = u"Docker for Azure {0} ({1})".format(docker_version, edition_version)
     data['variables']['imageSku'] = vhd_sku
     data['variables']['imageVersion'] = vhd_version
+    data['variables']['imageOffer'] = offer_id
     data['variables']['dockerForIAASVersion'] = docker_for_azure_version
 
     # Updated Manager custom data
@@ -185,7 +186,7 @@ def create_rg_cloud_template(release_channel, docker_version,
 
     return outfile
 
-def create_rg_ddc_template(vhd_sku, vhd_version, release_channel, docker_version,
+def create_rg_ddc_template(vhd_sku, vhd_version, offer_id, release_channel, docker_version,
                         docker_for_azure_version, edition_version, cfn_template, cloudformation_template_name):
     with open(cfn_template) as data_file:
         data = json.load(data_file)
@@ -199,9 +200,21 @@ def create_rg_ddc_template(vhd_sku, vhd_version, release_channel, docker_version
 
     data['variables']['imageSku'] = vhd_sku
     data['variables']['imageVersion'] = vhd_version
+    data['variables']['imageOffer'] = offer_id
 
+    # Use multiple steps to keep order
     parameters = data.get('parameters')
     if parameters:
+        new_parameters = {
+            "DDCUsername": {
+                "defaultValue": "admin",
+                "type": "String",
+                "metadata": {
+                    "description": "Please enter the username you want to use for Docker Datacenter."
+                }
+            }
+        }
+        parameters.update(new_parameters)
         new_parameters = {
             "DDCPassword": {
                 "minLength": 8,
@@ -210,13 +223,6 @@ def create_rg_ddc_template(vhd_sku, vhd_version, release_channel, docker_version
                 "metadata": {
                     "description": "Please enter the password you want to use for Docker Datacenter."
                 }
-            },
-            "DDCUsername": {
-                "defaultValue": "admin",
-                "type": "String",
-                "metadata": {
-                    "description": "Please enter the username you want to use for Docker Datacenter."
-                }
             }
         }
         parameters.update(new_parameters)
@@ -232,22 +238,105 @@ def create_rg_ddc_template(vhd_sku, vhd_version, release_channel, docker_version
     for key, val in enumerate(data.get('resources')):
         if val['name'] == "[variables('managerNSGName')]":
             security_rules = val['properties']['securityRules']
-            new_security_rule = {
-                "name": "ddc",
-                "properties": {
-                    "description": "Allow UCP",
-                    "protocol": "Tcp",
-                    "sourcePortRange": "*",
-                    "destinationPortRange": "443",
-                    "sourceAddressPrefix": "*",
-                    "destinationAddressPrefix": "*",
-                    "access": "Allow",
-                    "priority": 206,
-                    "direction": "Inbound"
+            new_security_rule = [
+                {
+                    "name": "ucp",
+                    "properties": {
+                        "description": "Allow UCP",
+                        "protocol": "Tcp",
+                        "sourcePortRange": "*",
+                        "destinationPortRange": "443",
+                        "sourceAddressPrefix": "*",
+                        "destinationAddressPrefix": "*",
+                        "access": "Allow",
+                        "priority": 206,
+                        "direction": "Inbound"
+                    }
+                },
+                {
+                    "name": "dtr",
+                    "properties": {
+                        "description": "Allow DTR",
+                        "protocol": "Tcp",
+                        "sourcePortRange": "*",
+                        "destinationPortRange": "8443",
+                        "sourceAddressPrefix": "*",
+                        "destinationAddressPrefix": "*",
+                        "access": "Allow",
+                        "priority": 207,
+                        "direction": "Inbound"
+                    }
                 }
+            ]
+            security_rules.extend(new_security_rule)
+        if val['name'] == "[variables('lbSSHName')]":
+            properties = val['properties']
+
+            loadbalancing_rules = {
+                "loadBalancingRules": [
+                    {
+                        "name": "ucpLbRule",
+                        "properties": {
+                            "frontendIPConfiguration": {
+                                    "id": "[variables('lbSSHFrontEndIPConfigID')]"
+                            },
+                            "backendAddressPool": {
+                                "id": "[concat(variables('lbSSHID'), '/backendAddressPools/default')]"
+                            },
+                            "protocol": "tcp",
+                            "frontendPort": 443,
+                            "backendPort": 443,
+                            "enableFloatingIP": False,
+                            "idleTimeoutInMinutes": 5,
+                            "probe": {
+                                "id": "[concat(variables('lbSSHID'),'/probes/ucp')]"
+                            }
+                        }
+                    },
+                    {
+                        "name": "dtrLbRule",
+                        "properties": {
+                            "frontendIPConfiguration": {
+                                    "id": "[variables('lbSSHFrontEndIPConfigID')]"
+                            },
+                            "backendAddressPool": {
+                                "id": "[concat(variables('lbSSHID'), '/backendAddressPools/default')]"
+                            },
+                            "protocol": "tcp",
+                            "frontendPort": 8443,
+                            "backendPort": 8443,
+                            "enableFloatingIP": False,
+                            "idleTimeoutInMinutes": 5,
+                            "probe": {
+                                "id": "[concat(variables('lbSSHID'),'/probes/dtr')]"
+                            }
+                        }
+                    },
+                ]
             }
-            security_rules.append(new_security_rule)
-            break
+            properties.update(loadbalancing_rules)
+            probes = val['properties']['probes']
+            new_probe = [
+                {
+                    "name": "ucp", 
+                    "properties": {
+                        "intervalInSeconds": 10, 
+                        "numberOfProbes": 2, 
+                        "port": 443, 
+                        "protocol": "Tcp"
+                    }
+                },
+                {
+                    "name": "dtr", 
+                    "properties": {
+                        "intervalInSeconds": 10, 
+                        "numberOfProbes": 2, 
+                        "port": 8443, 
+                        "protocol": "Tcp"
+                    }
+                }
+            ]
+            probes.extend(new_probe)
     outputs = data.get('outputs')
     if outputs:
         new_outputs = {