diff --git a/deployment-examples/openstack-kubernetes/k3s-cluster/main.tf b/deployment-examples/openstack-kubernetes/k3s-cluster/main.tf index ab655ec..a9db274 100644 --- a/deployment-examples/openstack-kubernetes/k3s-cluster/main.tf +++ b/deployment-examples/openstack-kubernetes/k3s-cluster/main.tf @@ -17,7 +17,7 @@ module "openstack_cogstack_infra" { }, ] allowed_ingress_ips_cidr = var.allowed_ingress_ips_cidr - ubuntu_immage_name = var.ubuntu_immage_name + ubuntu_image_name = var.ubuntu_image_name # generate_random_name_prefix = false # prefix = "dev" # network = { diff --git a/deployment-examples/openstack-kubernetes/k3s-cluster/terraform.tfvars.example b/deployment-examples/openstack-kubernetes/k3s-cluster/terraform.tfvars.example index bc4a0f3..276c966 100644 --- a/deployment-examples/openstack-kubernetes/k3s-cluster/terraform.tfvars.example +++ b/deployment-examples/openstack-kubernetes/k3s-cluster/terraform.tfvars.example @@ -7,4 +7,4 @@ openstack_environment = { allowed_ingress_ips_cidr = "10.0.0.1/23" -ubuntu_immage_name = "my_ubuntu_image" \ No newline at end of file +ubuntu_image_name = "my_ubuntu_image" \ No newline at end of file diff --git a/deployment-examples/openstack-kubernetes/k3s-cluster/variables.tf b/deployment-examples/openstack-kubernetes/k3s-cluster/variables.tf index 03850f0..0c651bd 100644 --- a/deployment-examples/openstack-kubernetes/k3s-cluster/variables.tf +++ b/deployment-examples/openstack-kubernetes/k3s-cluster/variables.tf @@ -19,7 +19,7 @@ variable "allowed_ingress_ips_cidr" { type = string } -variable "ubuntu_immage_name" { +variable "ubuntu_image_name" { type = string description = "Name of an available Machine Image running ubuntu in the openstack environment" } diff --git a/release-please-config.json b/release-please-config.json index 5ebd356..fba5347 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -134,7 +134,7 @@ "terraform-modules/openstack-kubernetes-k3s": { "release-type": "simple", "component": "terraform-modules/openstack-kubernetes-k3s", - "initial-version": "1.0.0", + "initial-version": "0.1.0", "changelog-path": "CHANGELOG.md", "bump-minor-pre-major": false, "bump-patch-for-minor-pre-major": false, diff --git a/terraform-modules/openstack-kubernetes-k3s/README.md b/terraform-modules/openstack-kubernetes-k3s/README.md index 5d439e6..dcbcc62 100644 --- a/terraform-modules/openstack-kubernetes-k3s/README.md +++ b/terraform-modules/openstack-kubernetes-k3s/README.md @@ -30,7 +30,7 @@ module "openstack_kubernetes_cluster" { name = "public" } allowed_ingress_ips_cidr = "0.0.0.0/24" - ubuntu_immage_name = "ubuntu-22.04" + ubuntu_image_name = "ubuntu-22.04" ssh_key_pair = { private_key_file = "~/.ssh/id_rsa", public_key_file = "~/.ssh/id_rsa.pub", diff --git a/terraform-modules/openstack-kubernetes-k3s/compute.tf b/terraform-modules/openstack-kubernetes-k3s/compute.tf index 76f4c46..9b74364 100644 --- a/terraform-modules/openstack-kubernetes-k3s/compute.tf +++ b/terraform-modules/openstack-kubernetes-k3s/compute.tf @@ -161,7 +161,7 @@ data "openstack_networking_network_v2" "network" { } data "openstack_images_image_v2" "ubuntu" { - name = var.ubuntu_immage_name + name = var.ubuntu_image_name most_recent = true } diff --git a/terraform-modules/openstack-kubernetes-k3s/tests/compute.tftest.hcl b/terraform-modules/openstack-kubernetes-k3s/tests/compute.tftest.hcl index 39698df..b9df229 100644 --- a/terraform-modules/openstack-kubernetes-k3s/tests/compute.tftest.hcl +++ b/terraform-modules/openstack-kubernetes-k3s/tests/compute.tftest.hcl @@ -28,7 +28,7 @@ run "server_and_node" { command = plan variables { - ubuntu_immage_name = "ubuntu" + ubuntu_image_name = "ubuntu" generate_random_name_prefix = false prefix = "test" network = { name = "public" } @@ -58,7 +58,7 @@ run "required_only" { command = plan variables { - ubuntu_immage_name = "ubuntu" + ubuntu_image_name = "ubuntu" network = { name = "public" } host_instances = [ { name = "controller", is_controller = true, flavour = "m1.small" }, @@ -86,7 +86,7 @@ run "all_variables" { command = plan variables { - ubuntu_immage_name = "ubuntu" + ubuntu_image_name = "ubuntu" allowed_ingress_ips_cidr = "10.1.2.0/24" k3s_version = "v1.32.2+k3s1" generate_random_name_prefix = false diff --git a/terraform-modules/openstack-kubernetes-k3s/variables.tf b/terraform-modules/openstack-kubernetes-k3s/variables.tf index 05edbd6..7e1c949 100644 --- a/terraform-modules/openstack-kubernetes-k3s/variables.tf +++ b/terraform-modules/openstack-kubernetes-k3s/variables.tf @@ -4,7 +4,7 @@ variable "allowed_ingress_ips_cidr" { description = "CIDR Block that is allowed ingress to deployed services" } -variable "ubuntu_immage_name" { +variable "ubuntu_image_name" { type = string description = "Name of an available Machine Image running ubuntu in the openstack environment" } @@ -23,7 +23,7 @@ name = Human readable hostname for this host. is_controller = Must be true for exactly one host. This will run the k3s "server". All other nodes run the k3s "agent". flavour = The openstack_compute_flavor_v2 for the host volume_size = Size in GB for the disk volume for the node -image_uuid = (Optional) The Openstack image you want to run, to override the default in ubuntu_immage_name +image_uuid = (Optional) The Openstack image you want to run, to override the default in ubuntu_image_name floating_ip = (Optional) Floating IP configuration. Set use_floating_ip to true and provide address to associate a floating IP with this host EOT type = list(object({