Skip to content

Commit 6a4cfa8

Browse files
committed
Fix new AWS tag name in all files
1 parent a218f95 commit 6a4cfa8

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

examples/ex1-cluster-in-default-vpc/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ output "kubeconfig" {
55

66
output "cluster_name" {
77
value = module.cluster.cluster_name
8-
description = "Name of the created cluster. This name is used as the value of the \"kubeadm:cluster\" tag assigned to all created resources."
8+
description = "Name of the created cluster. This name is used as the value of the \"terraform-kubeadm:cluster\" tag assigned to all created resources."
99
}
1010

1111
output "cluster_nodes" {

examples/ex2-cluster-in-existing-vpc/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ output "kubeconfig" {
55

66
output "cluster_name" {
77
value = module.cluster.cluster_name
8-
description = "Name of the created cluster. This name is used as the value of the \"kubeadm:cluster\" tag assigned to all created resources."
8+
description = "Name of the created cluster. This name is used as the value of the \"terraform-kubeadm:cluster\" tag assigned to all created resources."
99
}
1010

1111
output "cluster_nodes" {

examples/ex3-cluster-in-dedicated-vpc/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module "network" {
66
source = "weibeld/kubeadm/aws//modules/network"
77
version = "~> 0.2"
88
cidr_block = "10.0.0.0/16"
9-
tags = { "kubeadm:cluster" = module.cluster.cluster_name }
9+
tags = { "terraform-kubeadm:cluster" = module.cluster.cluster_name }
1010
}
1111

1212
module "cluster" {

examples/ex3-cluster-in-dedicated-vpc/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ output "kubeconfig" {
55

66
output "cluster_name" {
77
value = module.cluster.cluster_name
8-
description = "Name of the created cluster. This name is used as the value of the \"kubeadm:cluster\" tag assigned to all created resources."
8+
description = "Name of the created cluster. This name is used as the value of the \"terraform-kubeadm:cluster\" tag assigned to all created resources."
99
}
1010

1111
output "cluster_nodes" {

outputs.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ output "kubeconfig" {
55

66
output "cluster_name" {
77
value = local.cluster_name
8-
description = "Name of the created cluster. This name is used as the value of the \"kubeadm:cluster\" tag assigned to all created AWS resources."
8+
description = "Name of the created cluster. This name is used as the value of the \"terraform-kubeadm:cluster\" tag assigned to all created AWS resources."
99
}
1010

1111
output "cluster_nodes" {
1212
value = [
1313
for i in concat([aws_instance.master], aws_instance.workers, ) : {
14-
name = i.tags["kubeadm:node"]
14+
name = i.tags["terraform-kubeadm:node"]
1515
subnet_id = i.subnet_id
1616
private_ip = i.private_ip
17-
public_ip = i.tags["kubeadm:node"] == "master" ? aws_eip.master.public_ip : i.public_ip
17+
public_ip = i.tags["terraform-kubeadm:node"] == "master" ? aws_eip.master.public_ip : i.public_ip
1818
}
1919
]
2020
description = "Name, public and private IP address, and subnet ID of all nodes of the created cluster."

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ variable "kubeconfig_file" {
3636

3737
variable "cluster_name" {
3838
type = string
39-
description = "**This is an optional variable with a default value of null**. Name for the Kubernetes cluster. This name will be used as the value for the \"kubeadm:cluster\" tag that is assigned to all created AWS resources. If null, a random name is automatically chosen."
39+
description = "**This is an optional variable with a default value of null**. Name for the Kubernetes cluster. This name will be used as the value for the \"terraform-kubeadm:cluster\" tag that is assigned to all created AWS resources. If null, a random name is automatically chosen."
4040
default = null
4141
}
4242

@@ -78,6 +78,6 @@ variable "num_workers" {
7878

7979
variable "tags" {
8080
type = map(string)
81-
description = "A set of tags to assign to the created AWS resources. These tags will be assigned in addition to the default tags. The default tags include \"kubeadm:cluster\" which is assigned to all resources and whose value is the cluster name, and \"kubeadm:node\" which is assigned to the EC2 instances and whose value is the name of the Kubernetes node that this EC2 corresponds to."
81+
description = "A set of tags to assign to the created AWS resources. These tags will be assigned in addition to the default tags. The default tags include \"terraform-kubeadm:cluster\" which is assigned to all resources and whose value is the cluster name, and \"terraform-kubeadm:node\" which is assigned to the EC2 instances and whose value is the name of the Kubernetes node that this EC2 corresponds to."
8282
default = {}
8383
}

0 commit comments

Comments
 (0)