From 7180e832fea2577f7c93de9253b89d0ee1da4298 Mon Sep 17 00:00:00 2001 From: Jerome Petazzoni Date: Tue, 19 Oct 2021 03:15:22 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Clean=20up=20resource=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prepare-tf/modules/oraclecloud/main.tf | 2 +- prepare-tf/modules/oraclecloud/network.tf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/prepare-tf/modules/oraclecloud/main.tf b/prepare-tf/modules/oraclecloud/main.tf index 30260e35..4a3f4eae 100644 --- a/prepare-tf/modules/oraclecloud/main.tf +++ b/prepare-tf/modules/oraclecloud/main.tf @@ -22,7 +22,7 @@ data "oci_core_images" "_" { resource "oci_containerengine_cluster" "_" { compartment_id = local.compartment_id kubernetes_version = var.k8s_version - name = "oke-tf" + name = "tf-oke" vcn_id = oci_core_vcn._.id options { service_lb_subnet_ids = [oci_core_subnet.loadbalancers.id] diff --git a/prepare-tf/modules/oraclecloud/network.tf b/prepare-tf/modules/oraclecloud/network.tf index cc81b6cd..aef9dc4a 100644 --- a/prepare-tf/modules/oraclecloud/network.tf +++ b/prepare-tf/modules/oraclecloud/network.tf @@ -1,7 +1,7 @@ resource "oci_core_vcn" "_" { compartment_id = local.compartment_id cidr_block = "10.0.0.0/16" - display_name = "tf-vcn-${var.cluster_name}" + display_name = "tf-vcn" } # @@ -57,7 +57,7 @@ resource "oci_core_subnet" "controlplane" { compartment_id = local.compartment_id cidr_block = "10.0.254.0/24" vcn_id = oci_core_vcn._.id - display_name = "tf-subnet-controlplane" + display_name = "tf-controlplane" route_table_id = oci_core_default_route_table._.id security_list_ids = [oci_core_default_security_list._.id] } @@ -66,7 +66,7 @@ resource "oci_core_subnet" "nodes" { compartment_id = local.compartment_id cidr_block = "10.0.0.0/20" vcn_id = oci_core_vcn._.id - display_name = "tf-subnet-nodes" + display_name = "tf-nodes" route_table_id = oci_core_default_route_table._.id security_list_ids = [oci_core_default_security_list._.id] } @@ -75,7 +75,7 @@ resource "oci_core_subnet" "loadbalancers" { compartment_id = local.compartment_id cidr_block = "10.0.96.0/20" vcn_id = oci_core_vcn._.id - display_name = "tf-subnet-loadbalancers" + display_name = "tf-loadbalancers" route_table_id = oci_core_default_route_table._.id security_list_ids = [oci_core_default_security_list._.id] }