Skip to content

terraform: remove tectonicClusterID tag on resources #835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Dec 16, 2018
Merged

terraform: remove tectonicClusterID tag on resources #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions data/data/aws/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module "bootstrap" {

tags = "${merge(map(
"Name", "${var.cluster_name}-bootstrap",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.aws_extra_tags)}"
}
Expand Down Expand Up @@ -105,7 +104,6 @@ resource "aws_route53_zone" "int" {
tags = "${merge(map(
"Name", "${var.cluster_name}_int",
"KubernetesCluster", "${var.cluster_name}",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.aws_extra_tags)}"
}
2 changes: 0 additions & 2 deletions data/data/aws/master/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ resource "aws_instance" "master" {
tags = "${merge(map(
"Name", "${var.cluster_name}-master-${count.index}",
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}",
"clusterid", "${var.cluster_name}"
), var.extra_tags)}"
Expand All @@ -110,7 +109,6 @@ resource "aws_instance" "master" {
volume_tags = "${merge(map(
"Name", "${var.cluster_name}-master-${count.index}-vol",
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand Down
5 changes: 0 additions & 5 deletions data/data/aws/vpc/master-elb.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ resource "aws_lb" "api_internal" {

tags = "${merge(map(
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand All @@ -23,7 +22,6 @@ resource "aws_lb" "api_external" {

tags = "${merge(map(
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand All @@ -38,7 +36,6 @@ resource "aws_lb_target_group" "api_internal" {

tags = "${merge(map(
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"

Expand All @@ -61,7 +58,6 @@ resource "aws_lb_target_group" "api_external" {

tags = "${merge(map(
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"

Expand All @@ -84,7 +80,6 @@ resource "aws_lb_target_group" "services" {

tags = "${merge(map(
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"

Expand Down
2 changes: 0 additions & 2 deletions data/data/aws/vpc/sg-elb.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ resource "aws_security_group" "api" {
tags = "${merge(map(
"Name", "${var.cluster_name}_api_sg",
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand Down Expand Up @@ -45,7 +44,6 @@ resource "aws_security_group" "console" {
tags = "${merge(map(
"Name", "${var.cluster_name}_console_sg",
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand Down
1 change: 0 additions & 1 deletion data/data/aws/vpc/sg-etcd.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ resource "aws_security_group" "etcd" {
tags = "${merge(map(
"Name", "${var.cluster_name}_etcd_sg",
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand Down
1 change: 0 additions & 1 deletion data/data/aws/vpc/sg-master.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ resource "aws_security_group" "master" {
tags = "${merge(map(
"Name", "${var.cluster_name}_master_sg",
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand Down
1 change: 0 additions & 1 deletion data/data/aws/vpc/sg-worker.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ resource "aws_security_group" "worker" {
tags = "${merge(map(
"Name", "${var.cluster_name}_worker_sg",
"kubernetes.io/cluster/${var.cluster_name}", "owned",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand Down
2 changes: 0 additions & 2 deletions data/data/aws/vpc/vpc-private.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resource "aws_route_table" "private_routes" {
tags = "${merge(map(
"Name","${var.cluster_name}-private-${local.new_subnet_azs[count.index]}",
"kubernetes.io/cluster/${var.cluster_name}", "shared",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand All @@ -31,7 +30,6 @@ resource "aws_subnet" "worker_subnet" {
"Name", "${var.cluster_name}-worker-${local.new_subnet_azs[count.index]}",
"kubernetes.io/cluster/${var.cluster_name}","shared",
"kubernetes.io/role/internal-elb", "",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
),
var.extra_tags)}"
Expand Down
5 changes: 0 additions & 5 deletions data/data/aws/vpc/vpc-public.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ resource "aws_internet_gateway" "igw" {
tags = "${merge(map(
"Name", "${var.cluster_name}-igw",
"kubernetes.io/cluster/${var.cluster_name}", "shared",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand All @@ -15,7 +14,6 @@ resource "aws_route_table" "default" {
tags = "${merge(map(
"Name", "${var.cluster_name}-public",
"kubernetes.io/cluster/${var.cluster_name}", "shared",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand All @@ -42,7 +40,6 @@ resource "aws_subnet" "master_subnet" {
tags = "${merge(map(
"Name", "${var.cluster_name}-master-${local.new_subnet_azs[count.index]}",
"kubernetes.io/cluster/${var.cluster_name}", "shared",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand All @@ -58,7 +55,6 @@ resource "aws_eip" "nat_eip" {
vpc = true

tags = "${merge(map(
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"

Expand All @@ -74,7 +70,6 @@ resource "aws_nat_gateway" "nat_gw" {
subnet_id = "${aws_subnet.master_subnet.*.id[count.index]}"

tags = "${merge(map(
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
1 change: 0 additions & 1 deletion data/data/aws/vpc/vpc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ resource "aws_vpc" "new_vpc" {
tags = "${merge(map(
"Name", "${var.cluster_name}.${var.base_domain}",
"kubernetes.io/cluster/${var.cluster_name}", "shared",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.extra_tags)}"
}
Expand Down
1 change: 0 additions & 1 deletion data/data/openstack/bootstrap/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ resource "openstack_compute_instance_v2" "bootstrap" {
Name = "${var.cluster_name}-bootstrap"

# "kubernetes.io/cluster/${var.cluster_name}" = "owned"
tectonicClusterID = "${var.cluster_id}"
openshiftClusterID = "${var.cluster_id}"
}
}
1 change: 0 additions & 1 deletion data/data/openstack/lb/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ resource "openstack_compute_instance_v2" "load_balancer" {
Name = "${var.cluster_name}-bootstrap"

# "kubernetes.io/cluster/${var.cluster_name}" = "owned"
tectonicClusterID = "${var.cluster_id}"
openshiftClusterID = "${var.cluster_id}"
}
}
1 change: 0 additions & 1 deletion data/data/openstack/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ resource "openstack_objectstorage_container_v1" "container" {
metadata = "${merge(map(
"Name", "${var.cluster_name}-ignition-master",
"KubernetesCluster", "${var.cluster_name}",
"tectonicClusterID", "${var.cluster_id}",
"openshiftClusterID", "${var.cluster_id}"
), var.openstack_extra_tags)}"
}
1 change: 0 additions & 1 deletion data/data/openstack/masters/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ resource "openstack_compute_instance_v2" "master_conf" {
metadata {
Name = "${var.cluster_name}-master"
owned = "kubernetes.io/cluster/${var.cluster_name}"
tectonicClusterID = "${var.cluster_id}"
openshiftClusterID = "${var.cluster_id}"
}
}
14 changes: 7 additions & 7 deletions data/data/openstack/topology/private-network.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ locals {
resource "openstack_networking_network_v2" "openshift-private" {
name = "openshift"
admin_state_up = "true"
tags = ["tectonicClusterID=${var.cluster_id}", "openshiftClusterID=${var.cluster_id}"]
tags = ["openshiftClusterID=${var.cluster_id}"]
}

resource "openstack_networking_subnet_v2" "masters" {
name = "masters"
cidr = "${local.new_master_cidr_range}"
ip_version = 4
network_id = "${openstack_networking_network_v2.openshift-private.id}"
tags = ["tectonicClusterID=${var.cluster_id}", "openshiftClusterID=${var.cluster_id}"]
tags = ["openshiftClusterID=${var.cluster_id}"]
}

resource "openstack_networking_subnet_v2" "workers" {
name = "worker"
cidr = "${local.new_worker_cidr_range}"
ip_version = 4
network_id = "${openstack_networking_network_v2.openshift-private.id}"
tags = ["tectonicClusterID=${var.cluster_id}", "openshiftClusterID=${var.cluster_id}"]
tags = ["openshiftClusterID=${var.cluster_id}"]
}

resource "openstack_networking_port_v2" "masters" {
Expand All @@ -32,7 +32,7 @@ resource "openstack_networking_port_v2" "masters" {
admin_state_up = "true"
network_id = "${openstack_networking_network_v2.openshift-private.id}"
security_group_ids = ["${openstack_networking_secgroup_v2.master.id}"]
tags = ["tectonicClusterID=${var.cluster_id}", "openshiftClusterID=${var.cluster_id}"]
tags = ["openshiftClusterID=${var.cluster_id}"]

fixed_ip {
"subnet_id" = "${openstack_networking_subnet_v2.masters.id}"
Expand All @@ -45,7 +45,7 @@ resource "openstack_networking_port_v2" "bootstrap_port" {
admin_state_up = "true"
network_id = "${openstack_networking_network_v2.openshift-private.id}"
security_group_ids = ["${openstack_networking_secgroup_v2.master.id}"]
tags = ["tectonicClusterID=${var.cluster_id}", "openshiftClusterID=${var.cluster_id}"]
tags = ["openshiftClusterID=${var.cluster_id}"]

fixed_ip {
"subnet_id" = "${openstack_networking_subnet_v2.masters.id}"
Expand All @@ -58,7 +58,7 @@ resource "openstack_networking_port_v2" "lb_port" {
admin_state_up = "true"
network_id = "${openstack_networking_network_v2.openshift-private.id}"
security_group_ids = ["${openstack_networking_secgroup_v2.api.id}"]
tags = ["${format("tectonicClusterID=%s", var.cluster_id)}"]
tags = ["openshiftClusterID=${var.cluster_id}"]

fixed_ip {
"subnet_id" = "${openstack_networking_subnet_v2.masters.id}"
Expand All @@ -74,7 +74,7 @@ resource "openstack_networking_router_v2" "openshift-external-router" {
name = "openshift-external-router"
admin_state_up = true
external_network_id = "${data.openstack_networking_network_v2.external_network.id}"
tags = ["tectonicClusterID=${var.cluster_id}", "openshiftClusterID=${var.cluster_id}"]
tags = ["openshiftClusterID=${var.cluster_id}"]
}

resource "openstack_networking_router_interface_v2" "masters_router_interface" {
Expand Down
2 changes: 1 addition & 1 deletion data/data/openstack/topology/sg-lb.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resource "openstack_networking_secgroup_v2" "api" {
name = "api"
tags = ["tectonicClusterID=${var.cluster_id}", "openshiftClusterID=${var.cluster_id}"]
tags = ["openshiftClusterID=${var.cluster_id}"]
}

resource "openstack_networking_secgroup_rule_v2" "api_mcs" {
Expand Down
2 changes: 1 addition & 1 deletion data/data/openstack/topology/sg-master.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resource "openstack_networking_secgroup_v2" "master" {
name = "master"
tags = ["tectonicClusterID=${var.cluster_id}", "openshiftClusterID=${var.cluster_id}"]
tags = ["openshiftClusterID=${var.cluster_id}"]
}

resource "openstack_networking_secgroup_rule_v2" "master_mcs" {
Expand Down
2 changes: 1 addition & 1 deletion data/data/openstack/topology/sg-worker.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resource "openstack_networking_secgroup_v2" "worker" {
name = "worker"
tags = ["tectonicClusterID=${var.cluster_id}", "openshiftClusterID=${var.cluster_id}"]
tags = ["openshiftClusterID=${var.cluster_id}"]
}

resource "openstack_networking_secgroup_rule_v2" "worker_ingress_icmp" {
Expand Down
3 changes: 0 additions & 3 deletions pkg/asset/cluster/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ func Metadata(config *types.InstallConfig) *aws.Metadata {
return &aws.Metadata{
Region: config.Platform.AWS.Region,
Identifier: []map[string]string{
{
"tectonicClusterID": config.ClusterID,
},
{
"openshiftClusterID": config.ClusterID,
},
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/cluster/openstack/openstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ func Metadata(config *types.InstallConfig) *openstack.Metadata {
Region: config.Platform.OpenStack.Region,
Cloud: config.Platform.OpenStack.Cloud,
Identifier: map[string]string{
"tectonicClusterID": config.ClusterID,
"openshiftClusterID": config.ClusterID,
},
}
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/machines/aws/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ func provider(clusterID, clusterName string, platform *aws.Platform, mpool *aws.

func tagsFromUserTags(clusterID, clusterName string, usertags map[string]string) ([]awsprovider.TagSpecification, error) {
tags := []awsprovider.TagSpecification{
{Name: "tectonicClusterID", Value: clusterID},
{Name: "openshiftClusterID", Value: clusterID},
{Name: fmt.Sprintf("kubernetes.io/cluster/%s", clusterName), Value: "owned"},
}
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/machines/master.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ func (m *Master) Generate(dependencies asset.Parents) error {
}

tags := map[string]string{
"tectonicClusterID": ic.ClusterID,
"openshiftClusterID": ic.ClusterID,
}
config.Tags = tags
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/machines/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
}

tags := map[string]string{
"tectonicClusterID": ic.ClusterID,
"openshiftClusterID": ic.ClusterID,
}
config.Tags = tags
Expand Down