removed service

alphagov · Nov 22, 2023 · 9133961 · 9133961
1 parent 54b753c
commit 9133961
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 26 deletions.
diff --git a/terraform/deployments/cloudfront/main.tf b/terraform/deployments/cloudfront/main.tf
@@ -396,7 +396,6 @@ resource "aws_cloudfront_distribution" "www_distribution" {
   tags = {
     Product     = "GOV.UK"
     System      = "Cloudfront"
-    Service     = "Content Delivery"
     Environment = "${var.govuk_environment}"
     Owner       = "reliability-engineering@digital.cabinet-office.gov.uk"
   }
@@ -459,7 +458,6 @@ resource "aws_cloudfront_distribution" "assets_distribution" {
   tags = {
     Product     = "GOV.UK"
     System      = "Cloudfront"
-    Service     = "Content Delivery"
     Environment = "${var.govuk_environment}"
     Owner       = "reliability-engineering@digital.cabinet-office.gov.uk"
   }

diff --git a/terraform/deployments/cluster-infrastructure/clamav_db_efs.tf b/terraform/deployments/cluster-infrastructure/clamav_db_efs.tf
@@ -7,7 +7,6 @@ resource "aws_efs_file_system" "clamav-db" {
   tags = {
     Product     = "GOV.UK"
     System      = "Clamav Database"
-    Service     = "Antivirus Database"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Description = "EFS where Clamav virus signature database is stored"

diff --git a/terraform/deployments/cluster-infrastructure/external_dns.tf b/terraform/deployments/cluster-infrastructure/external_dns.tf
@@ -78,7 +78,6 @@ resource "aws_acm_certificate" "cluster_public" {
     Name        = local.external_dns_zone_name
     Product     = "GOV.UK"
     System      = "EKS"
-    Service     = "EKS Cluster Certificate"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
   }

diff --git a/terraform/deployments/cluster-infrastructure/main.tf b/terraform/deployments/cluster-infrastructure/main.tf
@@ -31,7 +31,6 @@ provider "aws" {
     tags = {
       Product              = "GOV.UK"
       System               = "EKS Cluster"
-      Service              = "Container hosting"
       Environment          = "${var.govuk_environment}"
       Owner                = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
       cluster              = var.cluster_name

diff --git a/terraform/deployments/cluster-infrastructure/vpc.tf b/terraform/deployments/cluster-infrastructure/vpc.tf
@@ -32,7 +32,6 @@ resource "aws_subnet" "eks_control_plane" {
   tags = {
     Product     = "GOV.UK"
     System      = "EKS Control Plane VPC"
-    Service     = "EKS Network"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "${var.cluster_name}-eks-control-plane-${each.key}"
@@ -45,7 +44,6 @@ resource "aws_route_table" "eks_control_plane" {
   tags = {
     Product     = "GOV.UK"
     System      = "EKS Control Plane Subnet"
-    Service     = "EKS Network"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "${var.cluster_name}-eks-control-plane-${each.key}"
@@ -82,7 +80,6 @@ resource "aws_subnet" "eks_public" {
   tags = {
     Product     = "GOV.UK"
     System      = "EKS Public Subnet"
-    Service     = "EKS Network"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "${var.cluster_name}-eks-public-${each.key}"
@@ -98,7 +95,6 @@ resource "aws_route_table" "eks_public" {
   tags = {
     Product     = "GOV.UK"
     System      = "EKS Public VPC"
-    Service     = "EKS Network"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "${var.cluster_name}-eks-public"
@@ -126,7 +122,6 @@ resource "aws_eip" "eks_nat" {
   tags = {
     Product     = "GOV.UK"
     System      = "EKS NAT Public Subnet"
-    Service     = "EKS Network"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "${var.cluster_name}-eks-nat-${each.key}"
@@ -141,7 +136,6 @@ resource "aws_nat_gateway" "eks" {
   tags = {
     Product     = "GOV.UK"
     System      = "EKS NAT Gateway"
-    Service     = "EKS Network"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "${var.cluster_name}-eks-${each.key}"
@@ -161,7 +155,6 @@ resource "aws_subnet" "eks_private" {
   tags = {
     Product     = "GOV.UK"
     System      = "EKS Private Subnet"
-    Service     = "EKS Network"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "${var.cluster_name}-eks-private-${each.key}"
@@ -177,7 +170,6 @@ resource "aws_route_table" "eks_private" {
   tags = {
     Product     = "GOV.UK"
     System      = "EKS Private VPC"
-    Service     = "EKS Network"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "${var.cluster_name}-eks-private-${each.key}"

diff --git a/terraform/deployments/datagovuk-infrastructure/main.tf b/terraform/deployments/datagovuk-infrastructure/main.tf
@@ -19,7 +19,6 @@ locals {
   default_tags = {
     Product              = "DATA.GOV.UK"
     System               = "DATA.GOV.UK"
-    Service              = "DATA.GOV.UK"
     Environment          = "${var.govuk_environment}"
     Owner                = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     project              = "replatforming"

diff --git a/terraform/deployments/ecr/ecr-scan.tf b/terraform/deployments/ecr/ecr-scan.tf
@@ -23,7 +23,6 @@ resource "aws_sns_topic" "ecr_scan_topic" {
   tags = {
     Product     = "GOV.UK"
     System      = "ECR Scan"
-    Service     = "ECR Scan"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "ECR-Scan"

diff --git a/terraform/deployments/ecr/main.tf b/terraform/deployments/ecr/main.tf
@@ -20,7 +20,6 @@ provider "aws" {
     tags = {
       Product              = "GOV.UK"
       System               = "Elastic Container Registry"
-      Service              = "Container image hosting"
       Environment          = "${var.govuk_environment}"
       Owner                = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
       project              = "replatforming"

diff --git a/terraform/deployments/github/main.tf b/terraform/deployments/github/main.tf
@@ -26,7 +26,6 @@ provider "aws" {
     tags = {
       Product              = "GOV.UK"
       System               = "Github"
-      Service              = "Source code repository/CI pipeline"
       Owner                = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
       project              = "replatforming"
       repository           = "govuk-infrastructure"

diff --git a/terraform/deployments/govuk-publishing-infrastructure/app_assets_s3.tf b/terraform/deployments/govuk-publishing-infrastructure/app_assets_s3.tf
@@ -4,7 +4,6 @@ resource "aws_s3_bucket" "app_assets" {
   tags = {
     Product     = "GOV.UK"
     System      = "App assets"
-    Service     = "App assets Object storage"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "App static assets for ${var.govuk_environment}"

diff --git a/terraform/deployments/govuk-publishing-infrastructure/frontend_memcache.tf b/terraform/deployments/govuk-publishing-infrastructure/frontend_memcache.tf
@@ -14,7 +14,6 @@ resource "aws_security_group" "frontend_memcached" {
   tags = {
     Product     = "GOV.UK"
     System      = "Frontend Memcached"
-    Service     = "Frontend Memcached Security Group"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = local.frontend_memcached_name
@@ -36,7 +35,6 @@ resource "aws_elasticache_cluster" "frontend_memcached" {
   tags = {
     Product     = "GOV.UK"
     System      = "Frontend Memcached"
-    Service     = "Frontend Memcached"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = local.frontend_memcached_name

diff --git a/terraform/deployments/govuk-publishing-infrastructure/locations_api_s3.tf b/terraform/deployments/govuk-publishing-infrastructure/locations_api_s3.tf
@@ -4,7 +4,6 @@ resource "aws_s3_bucket" "location_api_import_csvs" {
   tags = {
     Product     = "GOV.UK"
     System      = "Locations api"
-    Service     = "Object storage"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "CSVs used for importing postcode information into Locations API in ${var.govuk_environment}"

diff --git a/terraform/deployments/govuk-publishing-infrastructure/publisher_s3.tf b/terraform/deployments/govuk-publishing-infrastructure/publisher_s3.tf
@@ -4,7 +4,6 @@ resource "aws_s3_bucket" "publisher_csvs" {
   tags = {
     Product     = "GOV.UK"
     System      = "Publisher"
-    Service     = "Object storage"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "CSVs generated by Publisher in ${var.govuk_environment}"

diff --git a/terraform/deployments/govuk-publishing-infrastructure/search_analytics_s3.tf b/terraform/deployments/govuk-publishing-infrastructure/search_analytics_s3.tf
@@ -4,7 +4,6 @@ resource "aws_s3_bucket" "search_analytics" {
   tags = {
     Product     = "GOV.UK"
     System      = "Search analytics"
-    Service     = "Object storage"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "Search analytics reports for ${var.govuk_environment}"

diff --git a/terraform/deployments/govuk-publishing-infrastructure/security.tf b/terraform/deployments/govuk-publishing-infrastructure/security.tf
@@ -172,7 +172,6 @@ resource "aws_security_group" "eks_ingress_www_origin" {
   tags = {
     Product     = "GOV.UK"
     System      = "EKS Ingress"
-    Service     = "EKS Ingress Security Group"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
     Name        = "eks_ingress_www_origin"

diff --git a/terraform/deployments/govuk-publishing-infrastructure/shared_redis.tf b/terraform/deployments/govuk-publishing-infrastructure/shared_redis.tf
@@ -15,7 +15,6 @@ resource "aws_security_group" "shared_redis_cluster" {
     Name        = local.shared_redis_name
     Product     = "GOV.UK"
     System      = "Shared Redis"
-    Service     = "Shared Redis Security Group"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
   }
@@ -37,7 +36,6 @@ resource "aws_elasticache_replication_group" "shared_redis_cluster" {
     Name        = local.shared_redis_name
     Product     = "GOV.UK"
     System      = "Shared Redis"
-    Service     = "Shared Redis ElastiCache Replication Group"
     Environment = "${var.govuk_environment}"
     Owner       = "govuk-replatforming-team@digital.cabinet-office.gov.uk"
   }