From 5d185a608ec0501e8f056811e894536b08534129 Mon Sep 17 00:00:00 2001 From: Mateusz Urbanek Date: Thu, 22 Aug 2024 13:36:28 +0200 Subject: [PATCH] fix: terraform issues Signed-off-by: Mateusz Urbanek --- .github/workflows/tofu.yaml | 1 + terraform/linode/main.tf | 1 + terraform/linode/modules/lke/main.tf | 2 +- terraform/linode/modules/lke/variables.tf | 2 +- terraform/oci/main.tf | 4 ---- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tofu.yaml b/.github/workflows/tofu.yaml index b828f08..796aece 100644 --- a/.github/workflows/tofu.yaml +++ b/.github/workflows/tofu.yaml @@ -33,6 +33,7 @@ jobs: -var=kubeconfig=lke.yaml oci: + needs: [ "linode" ] concurrency: group: ${{ github.workflow }}-jobs runs-on: ubuntu-latest diff --git a/terraform/linode/main.tf b/terraform/linode/main.tf index 21b01eb..09ef7cd 100644 --- a/terraform/linode/main.tf +++ b/terraform/linode/main.tf @@ -1,5 +1,6 @@ module "lke" { source = "./modules/lke" cluster_name = "7S23SK" + k8s_version = "1.30" kubeconfig = var.kubeconfig } diff --git a/terraform/linode/modules/lke/main.tf b/terraform/linode/modules/lke/main.tf index 18e50d0..25a837d 100644 --- a/terraform/linode/modules/lke/main.tf +++ b/terraform/linode/modules/lke/main.tf @@ -1,7 +1,7 @@ provider "linode" {} resource "linode_lke_cluster" "lke" { - k8s_version = var.version + k8s_version = var.k8s_version label = var.cluster_name region = var.region diff --git a/terraform/linode/modules/lke/variables.tf b/terraform/linode/modules/lke/variables.tf index 528ce77..541b1b2 100644 --- a/terraform/linode/modules/lke/variables.tf +++ b/terraform/linode/modules/lke/variables.tf @@ -1,4 +1,4 @@ -variable "version" { +variable "k8s_version" { type = string } diff --git a/terraform/oci/main.tf b/terraform/oci/main.tf index 4ef660e..231b375 100644 --- a/terraform/oci/main.tf +++ b/terraform/oci/main.tf @@ -9,10 +9,6 @@ module "oci_core" { } module "oci_a1_flex" { - depends_on = [ - module.oci_core, - ] - source = "./modules/a1_flex" instance_name = "XUjVp3" subnet_id = module.oci_core.subnet_id