Set all packer templates to use private ip (#263)

* Set all packer templates to use private ip Signed-off-by: Peter Zhu <[email protected]> * Add new Agent Node SG rule to open all ports within same SG Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Mar 30, 2023 · 7c32c32 · 7c32c32
1 parent 37f4c68
commit 7c32c32
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/lib/security/ci-security-groups.ts b/lib/security/ci-security-groups.ts
@@ -45,6 +45,7 @@ export class JenkinsSecurityGroups {
     this.agentNodeSG.addIngressRule(this.mainNodeSG, Port.tcp(22), 'Main node SSH Access into agent nodes');
     this.agentNodeSG.addIngressRule(this.mainNodeSG, Port.tcp(445), 'Main node SMB Access into agent nodes for Windows');
     this.agentNodeSG.addIngressRule(this.mainNodeSG, Port.tcp(5985), 'Main node WinRM HTTP Access into agent nodes for Windows');
+    this.agentNodeSG.addIngressRule(this.agentNodeSG, Port.allTraffic(), 'Agent node open all ports to other agent nodes within the same SG');
 
     this.efsSG = new SecurityGroup(stack, 'efsSG', {
       vpc,

diff --git a/packer/jenkins-agent-al2-arm64.json b/packer/jenkins-agent-al2-arm64.json
@@ -35,7 +35,7 @@
         ],
         "most_recent":true
       },
-      "associate_public_ip_address":true,
+      "associate_public_ip_address":false,
       "ssh_username":  "ec2-user",
       "ssh_timeout": "3h",
       "tags": {

diff --git a/packer/jenkins-agent-al2-x64.json b/packer/jenkins-agent-al2-x64.json
@@ -35,7 +35,7 @@
         ],
         "most_recent":true
       },
-      "associate_public_ip_address":true,
+      "associate_public_ip_address":false,
       "ssh_username":  "ec2-user",
       "ssh_timeout": "3h",
       "tags": {

diff --git a/packer/jenkins-agent-macos12-x64.json b/packer/jenkins-agent-macos12-x64.json
@@ -41,7 +41,7 @@
         ],
         "most_recent":true
       },
-      "associate_public_ip_address":true,
+      "associate_public_ip_address":false,
       "ssh_username":  "ec2-user", 
       "ssh_timeout": "3h",
       "tenancy": "host",

diff --git a/packer/jenkins-agent-ubuntu2004-x64.json b/packer/jenkins-agent-ubuntu2004-x64.json
@@ -35,7 +35,7 @@
         ],
         "most_recent":true
       },
-      "associate_public_ip_address":true,
+      "associate_public_ip_address":false,
       "ssh_username":  "ubuntu",
       "ssh_timeout": "3h",
       "tags": {

diff --git a/packer/jenkins-agent-win2016-x64.json b/packer/jenkins-agent-win2016-x64.json
@@ -36,7 +36,7 @@
         "most_recent":true
       },
       "user_data_file":"scripts/windows/userdata.ps1",
-      "associate_public_ip_address":true,
+      "associate_public_ip_address":false,
       "communicator":"winrm",
       "winrm_username":"Administrator",
       "winrm_timeout":"40m",

diff --git a/packer/jenkins-agent-win2019-x64-alpine-wsl.json b/packer/jenkins-agent-win2019-x64-alpine-wsl.json
@@ -36,7 +36,7 @@
         "most_recent":true
       },
       "user_data_file":"scripts/windows/userdata.ps1",
-      "associate_public_ip_address":true,
+      "associate_public_ip_address":false,
       "communicator":"winrm",
       "winrm_username":"Administrator",
       "winrm_timeout":"40m",

diff --git a/packer/jenkins-agent-win2019-x64-gradle-check.json b/packer/jenkins-agent-win2019-x64-gradle-check.json
@@ -36,7 +36,7 @@
         "most_recent":true
       },
       "user_data_file":"scripts/windows/userdata.ps1",
-      "associate_public_ip_address":true,
+      "associate_public_ip_address":false,
       "communicator":"winrm",
       "winrm_username":"Administrator",
       "winrm_timeout":"40m",

diff --git a/packer/jenkins-agent-win2019-x64.json b/packer/jenkins-agent-win2019-x64.json
@@ -36,7 +36,7 @@
         "most_recent":true
       },
       "user_data_file":"scripts/windows/userdata.ps1",
-      "associate_public_ip_address":true,
+      "associate_public_ip_address":false,
       "communicator":"winrm",
       "winrm_username":"Administrator",
       "winrm_timeout":"40m",