From ecaa7dad49b325458b14e33b8ab884bf700b322b Mon Sep 17 00:00:00 2001 From: Abdelsalam Abbas Date: Mon, 10 Jul 2017 20:16:02 +0200 Subject: [PATCH] add a variable for kube_apiserver at all --- contrib/azurerm/group_vars/all | 2 ++ .../azurerm/roles/generate-templates/templates/masters.json | 6 +++--- .../azurerm/roles/generate-templates/templates/network.json | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/azurerm/group_vars/all b/contrib/azurerm/group_vars/all index d7c49742a..9cecfd5ed 100644 --- a/contrib/azurerm/group_vars/all +++ b/contrib/azurerm/group_vars/all @@ -19,6 +19,8 @@ admin_username: devops admin_password: changeme ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLRzcxbsFDdEibiyXCSdIFh7bKbXso1NqlKjEyPTptf3aBXHEhVil0lJRjGpTlpfTy7PHvXFbXIOCdv9tOmeH1uxWDDeZawgPFV6VSZ1QneCL+8bxzhjiCn8133wBSPZkN8rbFKd9eEUUBfx8ipCblYblF9FcidylwtMt5TeEmXk8yRVkPiCuEYuDplhc2H0f4PsK3pFb5aDVdaDT3VeIypnOQZZoUxHWqm6ThyHrzLJd3SrZf+RROFWW1uInIDf/SZlXojczUYoffxgT1lERfOJCHJXsqbZWugbxQBwqsVsX59+KPxFFo6nV88h3UQr63wbFx52/MXkX4WrCkAHzN ablock-vwfs@dell-lappy" +kube_apiserver_port: 6443 + # Azure CIDRs azure_vnet_cidr: 10.0.0.0/8 azure_admin_cidr: 10.241.2.0/24 diff --git a/contrib/azurerm/roles/generate-templates/templates/masters.json b/contrib/azurerm/roles/generate-templates/templates/masters.json index 842d5fb33..ecfc72140 100644 --- a/contrib/azurerm/roles/generate-templates/templates/masters.json +++ b/contrib/azurerm/roles/generate-templates/templates/masters.json @@ -62,8 +62,8 @@ "id": "[concat(variables('lbID'), '/backendAddressPools/kube-api-backend')]" }, "protocol": "tcp", - "frontendPort": 6443, - "backendPort": 6443, + "frontendPort": "{{kube_apiserver_port}}", + "backendPort": "{{kube_apiserver_port}}", "enableFloatingIP": false, "idleTimeoutInMinutes": 5, "probe": { @@ -77,7 +77,7 @@ "name": "kube-api", "properties": { "protocol": "tcp", - "port": 6443, + "port": "{{kube_apiserver_port}}", "intervalInSeconds": 5, "numberOfProbes": 2 } diff --git a/contrib/azurerm/roles/generate-templates/templates/network.json b/contrib/azurerm/roles/generate-templates/templates/network.json index 32a55d6d8..763b3dbb3 100644 --- a/contrib/azurerm/roles/generate-templates/templates/network.json +++ b/contrib/azurerm/roles/generate-templates/templates/network.json @@ -92,7 +92,7 @@ "description": "Allow secure kube-api", "protocol": "Tcp", "sourcePortRange": "*", - "destinationPortRange": "6443", + "destinationPortRange": "{{kube_apiserver_port}}", "sourceAddressPrefix": "Internet", "destinationAddressPrefix": "*", "access": "Allow",