Merge pull request #126 from binary-braids:dev

feat: add Docker instance configuration; replace k3s instance 3 with Docker instance

Author: data-tangles

core_instance/instance.tf

@@ -86,25 +86,25 @@ resource "oci_core_instance" "linux_instance_k3s_2" {
   }
 }
 
-# k3s Node 3
-resource "oci_core_instance" "linux_instance_k3s_3" {
-  availability_domain = var.k3s_3_availability_domain
+# Docker Node
+resource "oci_core_instance" "linux_docker_instance" {
+  availability_domain = var.availability_domain
   compartment_id      = var.compartment_id
   shape               = var.shape
-  display_name        = var.k3s_3_instance_display_name
-  freeform_tags       = merge(local.k3s_tags)
+  display_name        = var.docker_instance_display_name
+  freeform_tags       = merge(local.docker_tags)
 
   create_vnic_details {
     subnet_id        = var.subnet_id
-    private_ip       = var.k3s_3_private_ip
-    display_name     = "${var.k3s_3_instance_display_name}-nic"
+    private_ip       = var.docker_private_ip
+    display_name     = "${var.docker_instance_display_name}-nic"
     assign_public_ip = true
-    freeform_tags    = merge(local.k3s_tags)
+    freeform_tags    = merge(local.docker_tags)
   }
 
   source_details {
     source_type = "image"
-    source_id   = var.k3s_3_image_source_id
+    source_id   = var.image_source_id
   }
 
   metadata = {

core_instance/locals.tf

@@ -11,6 +11,12 @@ locals {
     createdby   = "Terraform"
   }
 
+  docker_tags = {
+    environment = var.tag_environment
+    purpose     = "Docker Node"
+    createdby   = "Terraform"
+  } 
+
   lb_tags = {
     environment = var.tag_environment
     purpose     = "Load Balancer"

core_instance/terraform.sops.tfvars

@@ -1,5 +1,5 @@
 {
-	"data": "ENC[AES256_GCM,data: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,iv:zntXqtXhYfd9IXrFe60u8yQya30SJjkf2ZbKDd1JBnM=,tag:PkJKCjbHNnhahdPkUapNeg==,type:str]",
+	"data": "ENC[AES256_GCM,data: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,iv:oWKPRzAsivmx05gAti+DqAQfm5HSD/WmEle5H1KkcA0=,tag:45j7z0fJUlTm8G+ZI1eR9g==,type:str]",
 	"sops": {
 		"kms": null,
 		"gcp_kms": null,
@@ -8,11 +8,11 @@
 		"age": [
 			{
 				"recipient": "age1mr2zn6n09ejsvw4zkmjjyyzv3889w2j22lzp4mejftzavcycu3pqjwpmlu",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzWS90U3l3aE5tak5DT3pZ\namFidUU3eXFBamhYOWcxY1lvazJmdUxTODFrCjdMaTJESGRKWEFHV0hnR1dRdnJY\nOW04K08zM2lReVJlQ0FKSnloSWVUSDgKLS0tIFNDd3pPcWZsVWQwREt1MDBrL2Ux\naVpwY2xmVmJ2U3VPbFFpWG01VEpJVk0KjxN6N1ZrNhsZaSERn4ctbVdMlHupXlqf\nBBbk18Cwl/tkgDB5ossfJCrtj/ImPUAPkv6yHiTaWlho9bsEfR5T7Q==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkcTJrMm4raFgxdWhyRGdQ\nUGc0SnRMZXNML2hhSTMxaEladDJkQ0dOTm5vCkFnUStxQnNZR2NXUklmZmNTNWdT\nMG9HamNMUTlvOUFndzhiM3I2cS9KbW8KLS0tIEpkQjBCZ3BLVTUycHBVQzNjcWsw\nMVFCbGtQdmxRQWQ1UFVKTG9pdkRZWm8KNyYq+E/+3cJzclZtdCpVfmys7/m+Rpjf\n6QMzgR6TAIcyIGdbjDeQZVjUGJoHkqX3/fAFDQZSYzGrkuM06Wa/cQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-04-21T16:37:46Z",
-		"mac": "ENC[AES256_GCM,data:0LB6cbzFMsdqCwdC28xrFVRar4JlPkRMsdBaOssLTOTSKG5qc6jhlqPyh0ATOlmzWZwApMcIwNeIDfaNyEasnUH8XG1wy4Dl94rG0deVo1cYRPE+WbXcQPwZfg4qoxPi3MqQogbdI1FJJ7Jaj6jVIt0/q0FUPUBayQpABM4LZhg=,iv:3UUsexvLmiLSAWTfizYACZ64TC3xZ0zfOq5JGHMS0lc=,tag:+L/da4DZBf1Y7DdxOzz8PA==,type:str]",
+		"lastmodified": "2025-05-17T15:13:35Z",
+		"mac": "ENC[AES256_GCM,data:U9Poctj5KVYezcUhUKy5jxRujzfJfaTawQ68MebjVYP73MPh+XcZduMHt3ifEDyP1n2rM4KUeVyF/XznJnLHYrUde/HXYuRvKmCnjbhlt3Vuqd/a2QwOnkKJqJPeIGBd7zBLtNZoS1PEoQKZ2CgmzTCLT/kbK5SeKreyWnK4ZvY=,iv:AyLC21BQ4E4v8GJ1TL5JJLqSyzVjelQL0FVEQbBN5yM=,tag:VH1ECt0tvrpj5k9fHjKY4Q==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.8.1"

core_instance/variables.tf

@@ -54,11 +54,6 @@ variable "k3s_2_availability_domain" {
   description = "Availability Domain for the k3s Core Instance"
 }
 
-variable "k3s_3_availability_domain" {
-  type        = string
-  description = "Availability Domain for the k3s Core Instance"
-}
-
 variable "instance_shape_config_memory_in_gbs" {
   type        = string
   description = "Memory for core instance"
@@ -84,9 +79,9 @@ variable "k3s_2_instance_display_name" {
   description = "Display name for k3s instance 2"
 }
 
-variable "k3s_3_instance_display_name" {
+variable "docker_instance_display_name" {
   type        = string
-  description = "Display name for k3s instance 3"
+  description = "Display name for Docker instance"
 }
 
 variable "k3s_1_private_ip" {
@@ -99,21 +94,16 @@ variable "k3s_2_private_ip" {
   description = "Private IP for k3s instance 2"
 }
 
-variable "k3s_3_private_ip" {
+variable "docker_private_ip" {
   type        = string
-  description = "Private IP for k3s instance 3"
+  description = "Private IP for Docker instance"
 }
 
 variable "k3s_image_source_id" {
   type        = string
   description = "Image Source for k3s"
 }
 
-variable "k3s_3_image_source_id" {
-  type        = string
-  description = "Image Source for k3s instance 3"
-}
-
 # Load Balancer Variables
 variable "nlb_name" {
   type        = string