Add selection of a load balancer Scheme

80degreeswest · Jun 8, 2020 · b114d67 · b114d67
1 parent 289effe
commit b114d67
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.eightydegreeswest</groupId>
 	<artifactId>bfmgr</artifactId>
-	<version>1.0.3</version>
+	<version>1.0.4</version>
 	<name>bfmgr</name>
 	<description>Buildfarm Manager</description>
 

diff --git a/src/main/java/com/eightydegreeswest/bfmgr/model/CreateClusterRequest.java b/src/main/java/com/eightydegreeswest/bfmgr/model/CreateClusterRequest.java
@@ -18,4 +18,5 @@ public class CreateClusterRequest {
   private String workerRepo;
   private String workerTag;
   private String workerConfig;
+  private String elbType;
 }
diff --git a/src/main/java/com/eightydegreeswest/bfmgr/service/impl/BfMgrCtrlAws.java b/src/main/java/com/eightydegreeswest/bfmgr/service/impl/BfMgrCtrlAws.java
@@ -142,6 +142,7 @@ public CreateClusterRequest getDefaultCreateClusterRequest() {
     createClusterRequest.setWorkerInstanceType(defaultWorkerInstanceType);
     createClusterRequest.setWorkerRepo(workerRepo);
     createClusterRequest.setWorkerTag(buildfarmTag);
+    createClusterRequest.setElbType("internet-facing");
     return createClusterRequest;
   }
 
@@ -226,6 +227,7 @@ private Collection<Parameter> getCloudFormationParameters(CreateClusterRequest c
     parameters.add(getParameter("ServerConfigFile", createClusterRequest.getServerConfig()));
     parameters.add(getParameter("ClusterName", createClusterRequest.getClusterName()));
     parameters.add(getParameter("RequiredTagName", getAssetTag()));
+    parameters.add(getParameter("ElbType", createClusterRequest.getElbType()));
     return parameters;
   }
 

diff --git a/src/main/resources/aws.json b/src/main/resources/aws.json
@@ -61,6 +61,12 @@
     "RequiredTagName":{
       "Type":"String",
       "Description":"Required tag name (Asset)."
+    },
+    "ElbType":{
+      "Type":"String",
+      "Default" : "internet-facing",
+      "AllowedValues" : ["internet-facing", "internal"],
+      "Description":"Load balancer type."
     }
   },
   "Resources":{
@@ -285,7 +291,9 @@
     "LoadBalancerServer":{
       "Type":"AWS::ElasticLoadBalancingV2::LoadBalancer",
       "Properties":{
-        "Scheme":"internet-facing",
+        "Scheme":{
+          "Ref":  "ElbType"
+        },
         "Subnets":{
           "Ref":"SubnetPool"
         },

diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html
@@ -97,6 +97,13 @@ <h5 class="modal-title" id="createClusterModalLabel">Create a new Buildfarm Clus
 							<option th:each="securityGroupItem : ${securityGroupList}" th:value="${ securityGroupItem.getGroupId() }"><p th:text="${ securityGroupItem.getGroupName() + ' (' + securityGroupItem.getGroupId() + ')' }" th:remove="tag"></p></option>
 						</select>
 					</div>
+					<div class="form-group row">
+						<label for="elbType" class="col-sm-3 col-form-label">ELB Type</label>
+						<select class="col-sm-8" id="elbType" th:field="*{elbType}">
+							<option value="internet-facing">internet-facing</option>
+							<option value="internal">internal</option>
+						</select>
+					</div>
 					<div class="form-group row">
 						<label for="ami" class="col-sm-3 col-form-label">AMI</label>
 						<input class="col-sm-8" id="ami" type="text" th:field="*{ami}" />