From b1b407a0b4df51b54fe0b6013dafd77a9017cdf2 Mon Sep 17 00:00:00 2001
From: tkob <tkob@users.noreply.github.com>
Date: Wed, 12 May 2021 23:34:17 +0900
Subject: [PATCH] Replace map in Terraform scripts with tomap (#7576) (#7578)
* Replace map in Terraform scripts with tomap (#7576)
* Fix Terraform linter warnings (#7576)
---
.../terraform/aws/create-infrastructure.tf | 40 ++++++++---------
contrib/terraform/aws/modules/elb/main.tf | 12 ++---
contrib/terraform/aws/modules/vpc/main.tf | 44 +++++++++----------
3 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/contrib/terraform/aws/create-infrastructure.tf b/contrib/terraform/aws/create-infrastructure.tf
index 1c7f036b7..4a12ecb74 100644
--- a/contrib/terraform/aws/create-infrastructure.tf
+++ b/contrib/terraform/aws/create-infrastructure.tf
@@ -61,11 +61,11 @@ resource "aws_instance" "bastion-server" {
key_name = var.AWS_SSH_KEY_NAME
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-bastion-${count.index}",
- "Cluster", var.aws_cluster_name,
- "Role", "bastion-${var.aws_cluster_name}-${count.index}"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-bastion-${count.index}"
+ Cluster = var.aws_cluster_name
+ Role = "bastion-${var.aws_cluster_name}-${count.index}"
+ }))
}
/*
@@ -87,11 +87,11 @@ resource "aws_instance" "k8s-master" {
iam_instance_profile = module.aws-iam.kube_control_plane-profile
key_name = var.AWS_SSH_KEY_NAME
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-master${count.index}",
- "kubernetes.io/cluster/${var.aws_cluster_name}", "member",
- "Role", "master"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-master${count.index}"
+ "kubernetes.io/cluster/${var.aws_cluster_name}" = "member"
+ Role = "master"
+ }))
}
resource "aws_elb_attachment" "attach_master_nodes" {
@@ -113,11 +113,11 @@ resource "aws_instance" "k8s-etcd" {
key_name = var.AWS_SSH_KEY_NAME
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-etcd${count.index}",
- "kubernetes.io/cluster/${var.aws_cluster_name}", "member",
- "Role", "etcd"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-etcd${count.index}"
+ "kubernetes.io/cluster/${var.aws_cluster_name}" = "member"
+ Role = "etcd"
+ }))
}
resource "aws_instance" "k8s-worker" {
@@ -134,11 +134,11 @@ resource "aws_instance" "k8s-worker" {
iam_instance_profile = module.aws-iam.kube-worker-profile
key_name = var.AWS_SSH_KEY_NAME
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-worker${count.index}",
- "kubernetes.io/cluster/${var.aws_cluster_name}", "member",
- "Role", "worker"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-worker${count.index}"
+ "kubernetes.io/cluster/${var.aws_cluster_name}" = "member"
+ Role = "worker"
+ }))
}
/*
diff --git a/contrib/terraform/aws/modules/elb/main.tf b/contrib/terraform/aws/modules/elb/main.tf
index 0733a8a3a..07491162d 100644
--- a/contrib/terraform/aws/modules/elb/main.tf
+++ b/contrib/terraform/aws/modules/elb/main.tf
@@ -2,9 +2,9 @@ resource "aws_security_group" "aws-elb" {
name = "kubernetes-${var.aws_cluster_name}-securitygroup-elb"
vpc_id = var.aws_vpc_id
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-securitygroup-elb"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-securitygroup-elb"
+ }))
}
resource "aws_security_group_rule" "aws-allow-api-access" {
@@ -51,7 +51,7 @@ resource "aws_elb" "aws-elb-api" {
connection_draining = true
connection_draining_timeout = 400
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-elb-api"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-elb-api"
+ }))
}
diff --git a/contrib/terraform/aws/modules/vpc/main.tf b/contrib/terraform/aws/modules/vpc/main.tf
index 77601d267..d86f0c6c7 100644
--- a/contrib/terraform/aws/modules/vpc/main.tf
+++ b/contrib/terraform/aws/modules/vpc/main.tf
@@ -5,9 +5,9 @@ resource "aws_vpc" "cluster-vpc" {
enable_dns_support = true
enable_dns_hostnames = true
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-vpc"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-vpc"
+ }))
}
resource "aws_eip" "cluster-nat-eip" {
@@ -18,9 +18,9 @@ resource "aws_eip" "cluster-nat-eip" {
resource "aws_internet_gateway" "cluster-vpc-internetgw" {
vpc_id = aws_vpc.cluster-vpc.id
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-internetgw"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-internetgw"
+ }))
}
resource "aws_subnet" "cluster-vpc-subnets-public" {
@@ -29,10 +29,10 @@ resource "aws_subnet" "cluster-vpc-subnets-public" {
availability_zone = element(var.aws_avail_zones, count.index)
cidr_block = element(var.aws_cidr_subnets_public, count.index)
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-${element(var.aws_avail_zones, count.index)}-public",
- "kubernetes.io/cluster/${var.aws_cluster_name}", "member"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-${element(var.aws_avail_zones, count.index)}-public"
+ "kubernetes.io/cluster/${var.aws_cluster_name}" = "member"
+ }))
}
resource "aws_nat_gateway" "cluster-nat-gateway" {
@@ -47,9 +47,9 @@ resource "aws_subnet" "cluster-vpc-subnets-private" {
availability_zone = element(var.aws_avail_zones, count.index)
cidr_block = element(var.aws_cidr_subnets_private, count.index)
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-${element(var.aws_avail_zones, count.index)}-private"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-${element(var.aws_avail_zones, count.index)}-private"
+ }))
}
#Routing in VPC
@@ -64,9 +64,9 @@ resource "aws_route_table" "kubernetes-public" {
gateway_id = aws_internet_gateway.cluster-vpc-internetgw.id
}
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-routetable-public"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-routetable-public"
+ }))
}
resource "aws_route_table" "kubernetes-private" {
@@ -78,9 +78,9 @@ resource "aws_route_table" "kubernetes-private" {
nat_gateway_id = element(aws_nat_gateway.cluster-nat-gateway.*.id, count.index)
}
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-routetable-private-${count.index}"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-routetable-private-${count.index}"
+ }))
}
resource "aws_route_table_association" "kubernetes-public" {
@@ -101,9 +101,9 @@ resource "aws_security_group" "kubernetes" {
name = "kubernetes-${var.aws_cluster_name}-securitygroup"
vpc_id = aws_vpc.cluster-vpc.id
- tags = merge(var.default_tags, map(
- "Name", "kubernetes-${var.aws_cluster_name}-securitygroup"
- ))
+ tags = merge(var.default_tags, tomap({
+ Name = "kubernetes-${var.aws_cluster_name}-securitygroup"
+ }))
}
resource "aws_security_group_rule" "allow-all-ingress" {