From 37435e3b4f90a11e038d5c93ae75e4fcc8609ac6 Mon Sep 17 00:00:00 2001 From: alhendrickson Date: Fri, 30 Oct 2026 14:21:45 +0000 Subject: [PATCH] chore(iac): Rename k3s module dir. Add to release please --- .release-please-manifest.json | 1 + .../openstack-kubernetes/k3s-cluster/main.tf | 2 +- release-please-config.json | 10 ++++++++++ .../.terraform.lock.hcl | 0 .../README.md | 2 +- .../cloud-init-k3s-agent.yaml | 0 .../cloud-init-k3s-server.yaml | 0 .../compute-keypair.tf | 0 .../compute.tf | 0 .../kubeconfig-extraction.tf | 0 .../networking.tf | 0 .../outputs.tf | 0 .../providers.tf | 0 .../shared-locals.tf | 0 .../tests/compute.tftest.hcl | 0 .../tests/fixtures/fake_key | 0 .../tests/fixtures/fake_key.pub | 0 .../variables.tf | 0 18 files changed, 13 insertions(+), 2 deletions(-) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/.terraform.lock.hcl (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/README.md (98%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/cloud-init-k3s-agent.yaml (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/cloud-init-k3s-server.yaml (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/compute-keypair.tf (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/compute.tf (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/kubeconfig-extraction.tf (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/networking.tf (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/outputs.tf (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/providers.tf (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/shared-locals.tf (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/tests/compute.tftest.hcl (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/tests/fixtures/fake_key (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/tests/fixtures/fake_key.pub (100%) rename terraform-modules/{openstack-kubernetes-infra => openstack-kubernetes-k3s}/variables.tf (100%) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 746283e4..aacada2d 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -6,6 +6,7 @@ "helm-charts/cogstack-observability-helm": "0.4.1", "helm-charts/cogstack-jupyterhub-helm": "0.5.0", "helm-charts/ocr-service-helm": "0.1.0", + "terraform-modules/openstack-kubernetes-k3s": "0.0.0", "apps/ocr-service": "1.1.3", "apps/cogstack-jupyter-hub": "2.3.6" } diff --git a/deployment-examples/openstack-kubernetes/k3s-cluster/main.tf b/deployment-examples/openstack-kubernetes/k3s-cluster/main.tf index ee19981c..ab655ecb 100644 --- a/deployment-examples/openstack-kubernetes/k3s-cluster/main.tf +++ b/deployment-examples/openstack-kubernetes/k3s-cluster/main.tf @@ -1,5 +1,5 @@ module "openstack_cogstack_infra" { - source = "../../../deployment/terraform/modules/openstack-kubernetes-infra" + source = "../../../terraform-modules/openstack-kubernetes-k3s" host_instances = [ { name = "cogstack-k3s", diff --git a/release-please-config.json b/release-please-config.json index b086662f..5ebd3563 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -131,6 +131,16 @@ { "type": "revert", "section": "Reverts" } ] }, + "terraform-modules/openstack-kubernetes-k3s": { + "release-type": "simple", + "component": "terraform-modules/openstack-kubernetes-k3s", + "initial-version": "1.0.0", + "changelog-path": "CHANGELOG.md", + "bump-minor-pre-major": false, + "bump-patch-for-minor-pre-major": false, + "draft": false, + "prerelease": false + }, "apps/ocr-service": { "release-type": "python", "component": "ocr-service", diff --git a/terraform-modules/openstack-kubernetes-infra/.terraform.lock.hcl b/terraform-modules/openstack-kubernetes-k3s/.terraform.lock.hcl similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/.terraform.lock.hcl rename to terraform-modules/openstack-kubernetes-k3s/.terraform.lock.hcl diff --git a/terraform-modules/openstack-kubernetes-infra/README.md b/terraform-modules/openstack-kubernetes-k3s/README.md similarity index 98% rename from terraform-modules/openstack-kubernetes-infra/README.md rename to terraform-modules/openstack-kubernetes-k3s/README.md index 166daf00..5d439e6d 100644 --- a/terraform-modules/openstack-kubernetes-infra/README.md +++ b/terraform-modules/openstack-kubernetes-k3s/README.md @@ -16,7 +16,7 @@ Terraform Module for provisioning VMs on Openstack as a kubernetes cluster using ```hcl module "openstack_kubernetes_cluster" { - source = "../../modules/openstack-kubernetes-infra" + source = "../../modules/openstack-kubernetes-k3s" host_instances = [ { name = "cogstack-k3s-server", is_controller = true, flavour = "m1.small" }, { diff --git a/terraform-modules/openstack-kubernetes-infra/cloud-init-k3s-agent.yaml b/terraform-modules/openstack-kubernetes-k3s/cloud-init-k3s-agent.yaml similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/cloud-init-k3s-agent.yaml rename to terraform-modules/openstack-kubernetes-k3s/cloud-init-k3s-agent.yaml diff --git a/terraform-modules/openstack-kubernetes-infra/cloud-init-k3s-server.yaml b/terraform-modules/openstack-kubernetes-k3s/cloud-init-k3s-server.yaml similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/cloud-init-k3s-server.yaml rename to terraform-modules/openstack-kubernetes-k3s/cloud-init-k3s-server.yaml diff --git a/terraform-modules/openstack-kubernetes-infra/compute-keypair.tf b/terraform-modules/openstack-kubernetes-k3s/compute-keypair.tf similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/compute-keypair.tf rename to terraform-modules/openstack-kubernetes-k3s/compute-keypair.tf diff --git a/terraform-modules/openstack-kubernetes-infra/compute.tf b/terraform-modules/openstack-kubernetes-k3s/compute.tf similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/compute.tf rename to terraform-modules/openstack-kubernetes-k3s/compute.tf diff --git a/terraform-modules/openstack-kubernetes-infra/kubeconfig-extraction.tf b/terraform-modules/openstack-kubernetes-k3s/kubeconfig-extraction.tf similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/kubeconfig-extraction.tf rename to terraform-modules/openstack-kubernetes-k3s/kubeconfig-extraction.tf diff --git a/terraform-modules/openstack-kubernetes-infra/networking.tf b/terraform-modules/openstack-kubernetes-k3s/networking.tf similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/networking.tf rename to terraform-modules/openstack-kubernetes-k3s/networking.tf diff --git a/terraform-modules/openstack-kubernetes-infra/outputs.tf b/terraform-modules/openstack-kubernetes-k3s/outputs.tf similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/outputs.tf rename to terraform-modules/openstack-kubernetes-k3s/outputs.tf diff --git a/terraform-modules/openstack-kubernetes-infra/providers.tf b/terraform-modules/openstack-kubernetes-k3s/providers.tf similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/providers.tf rename to terraform-modules/openstack-kubernetes-k3s/providers.tf diff --git a/terraform-modules/openstack-kubernetes-infra/shared-locals.tf b/terraform-modules/openstack-kubernetes-k3s/shared-locals.tf similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/shared-locals.tf rename to terraform-modules/openstack-kubernetes-k3s/shared-locals.tf diff --git a/terraform-modules/openstack-kubernetes-infra/tests/compute.tftest.hcl b/terraform-modules/openstack-kubernetes-k3s/tests/compute.tftest.hcl similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/tests/compute.tftest.hcl rename to terraform-modules/openstack-kubernetes-k3s/tests/compute.tftest.hcl diff --git a/terraform-modules/openstack-kubernetes-infra/tests/fixtures/fake_key b/terraform-modules/openstack-kubernetes-k3s/tests/fixtures/fake_key similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/tests/fixtures/fake_key rename to terraform-modules/openstack-kubernetes-k3s/tests/fixtures/fake_key diff --git a/terraform-modules/openstack-kubernetes-infra/tests/fixtures/fake_key.pub b/terraform-modules/openstack-kubernetes-k3s/tests/fixtures/fake_key.pub similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/tests/fixtures/fake_key.pub rename to terraform-modules/openstack-kubernetes-k3s/tests/fixtures/fake_key.pub diff --git a/terraform-modules/openstack-kubernetes-infra/variables.tf b/terraform-modules/openstack-kubernetes-k3s/variables.tf similarity index 100% rename from terraform-modules/openstack-kubernetes-infra/variables.tf rename to terraform-modules/openstack-kubernetes-k3s/variables.tf