Fully deployed; not 100% functional.

danmanners · Nov 27, 2023 · 249d0e1 · 249d0e1
1 parent 099add1
commit 249d0e1
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 37 deletions.
diff --git a/iac/cloud/pulumi/index.ts b/iac/cloud/pulumi/index.ts
@@ -39,7 +39,7 @@ for (let k of config.compute.control_plane_nodes) {
     config.amis,
     vpc.privSubnets[k.subnet_name].id,
     [sg_talos_configuration.id],
-    iam_role.iamInstanceProfile.arn,
+    iam_role.iamInstanceProfile.name,
     null,
     config.tags
   );

diff --git a/iac/cloud/pulumi/modules/bastion.ts b/iac/cloud/pulumi/modules/bastion.ts
@@ -163,6 +163,12 @@ export function createBastion(
     // Cloud-Init - SSH Load
     userData: user_data,
 
+    // Instance Metadata
+    metadataOptions: {
+      httpPutResponseHopLimit: 4,
+      httpEndpoint: "enabled", 
+    },
+
     // Tags
     tags: Object.assign({}, tags, {
       Name: nodeConfig.name,

diff --git a/iac/cloud/pulumi/modules/kube-nodes.ts b/iac/cloud/pulumi/modules/kube-nodes.ts
@@ -24,44 +24,42 @@ export function createInstance(
   tags?: any
 ) {
   // Create the talos Control Plane & associate the role
-  const kubeControlPlane = new aws.ec2.Instance(
-    `${nodeConfig.name}`,
-    {
-      ami: amis[region][`masters_${nodeConfig.arch}`],
-      instanceType: nodeConfig.instance_size,
+  const kubeControlPlane = new aws.ec2.Instance(`${nodeConfig.name}`, {
+    ami: amis[region][`masters_${nodeConfig.arch}`],
+    instanceType: nodeConfig.instance_size,
 
-      // Networking
-      subnetId: subnet,
-      sourceDestCheck: false,
-      privateIp: nodeConfig.privateIp,
-      vpcSecurityGroupIds: security_group_ids,
-      privateDnsNameOptions: {
-        enableResourceNameDnsARecord: true,
-        hostnameType: "resource-name",
-      },
+    // Networking
+    subnetId: subnet,
+    sourceDestCheck: false,
+    privateIp: nodeConfig.privateIp,
+    vpcSecurityGroupIds: security_group_ids,
+    privateDnsNameOptions: {
+      enableResourceNameDnsARecord: true,
+      hostnameType: "resource-name",
+    },
 
-      // Storage
-      rootBlockDevice: {
-        deleteOnTermination: true,
-        volumeType: nodeConfig.root_volume_type,
-        volumeSize: nodeConfig.root_volume_size,
-      },
+    // Storage
+    rootBlockDevice: {
+      deleteOnTermination: true,
+      volumeType: nodeConfig.root_volume_type,
+      volumeSize: nodeConfig.root_volume_size,
+    },
 
-      // IAM Instance Profile
-      iamInstanceProfile: iamInstanceProfile,
-      // Instance Metadata Options
-      metadataOptions: {
-        httpPutResponseHopLimit: 4,
-      },
+    // IAM Instance Profile
+    iamInstanceProfile: iamInstanceProfile,
+    // Instance Metadata Options
+    metadataOptions: {
+      httpPutResponseHopLimit: 4,
+      httpEndpoint: "enabled",
+    },
 
-      // Tags
-      tags: Object.assign({}, tags, { Name: nodeConfig.name }),
-      volumeTags: Object.assign({}, tags, { Name: nodeConfig.name }),
+    // Tags
+    tags: Object.assign({}, tags, { Name: nodeConfig.name }),
+    volumeTags: Object.assign({}, tags, { Name: nodeConfig.name }),
 
-      // Cloud-Init - SSH Load
-      userData: userDataEval(nodeConfig, user_data),
-    }
-  );
+    // Cloud-Init - SSH Load
+    userData: userDataEval(nodeConfig, user_data),
+  });
 
   return {
     privateIp: kubeControlPlane.privateIp,

diff --git a/iac/cloud/pulumi/vars/environment.ts b/iac/cloud/pulumi/vars/environment.ts
@@ -41,7 +41,7 @@ export const network = {
   // VPC Cidr Block Definition
   vpc: {
     name: "homelab-vpc",
-    cidr_block: "172.29.0.0/20",
+    cidr_block: "172.29.0.0/19",
   },
   // Subnet Definitions
   subnets: {
@@ -101,13 +101,14 @@ export const compute: {
   worker_nodes: [],
   bastion: [
     {
-      name: "kube-worker-2",
+      name: "bastion",
+      // name: "kube-worker-2",
       instance_size: "t3.micro",
       arch: "amd64",
       subnet_name: "public1a",
       root_volume_size: 40,
       root_volume_type: "gp3",
-      privateIp: "172.29.8.101",
+      privateIp: "172.29.0.101",
     },
   ],
 };