fix: terraform issues

Signed-off-by: Mateusz Urbanek <mateusz.urbanek.98@gmail.com>
anza-labs · Aug 22, 2024 · 5d185a6 · 5d185a6
1 parent 37cd2da
commit 5d185a6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-variable "version" {
+variable "k8s_version" {
   type = string
 }
 

diff --git 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