Commit 74e63812 authored by Michal Wasilewski's avatar Michal Wasilewski

remove remainings of a deprecated traces queue

parent 4f364eb8
......@@ -1025,36 +1025,6 @@
],
"ttl": 300
},
"sidekiq-traces-01.sv.prd.gitlab.com.": {
"records": [
"10.69.6.71"
],
"ttl": 300
},
"sidekiq-traces-02.sv.prd.gitlab.com.": {
"records": [
"10.69.6.72"
],
"ttl": 300
},
"sidekiq-traces-03.sv.prd.gitlab.com.": {
"records": [
"10.69.6.73"
],
"ttl": 300
},
"sidekiq-traces-04.sv.prd.gitlab.com.": {
"records": [
"10.69.6.74"
],
"ttl": 300
},
"sidekiq-traces-05.sv.prd.gitlab.com.": {
"records": [
"10.69.6.75"
],
"ttl": 300
},
"web-01.sv.prd.gitlab.com.": {
"records": [
"10.69.8.101"
......
......@@ -308,8 +308,6 @@ module "sidekiq" {
sidekiq_pullmirror_instance_type = var.machine_types["sidekiq-pullmirror"]
sidekiq_realtime_count = var.node_count["sidekiq-realtime"]
sidekiq_realtime_instance_type = var.machine_types["sidekiq-realtime"]
sidekiq_traces_count = var.node_count["sidekiq-traces"]
sidekiq_traces_instance_type = var.machine_types["sidekiq-traces"]
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v3.0.2"
tier = "sv"
use_new_node_name = true
......@@ -906,4 +904,3 @@ resource "google_kms_key_ring_iam_binding" "secrets" {
"serviceAccount:${var.service_account_email}",
]
}
......@@ -291,7 +291,6 @@ variable "machine_types" {
"sidekiq-pipeline" = "n1-standard-8"
"sidekiq-pullmirror" = "n1-standard-8"
"sidekiq-realtime" = "n1-highmem-16"
"sidekiq-traces" = "n1-standard-8"
"stor" = "n1-standard-16"
"thanos-store" = "n1-highmem-8"
"thanos-compact" = "n1-standard-2"
......@@ -331,7 +330,6 @@ variable "node_count" {
"sidekiq-pipeline" = 0
"sidekiq-pullmirror" = 0
"sidekiq-realtime" = 0
"sidekiq-traces" = 0
"thanos-compact" = 1
"thanos-store" = 1
"stor" = 1
......@@ -597,4 +595,3 @@ locals {
"roles/pubsub.subscriber",
]
}
......@@ -718,8 +718,6 @@ module "sidekiq" {
sidekiq_pullmirror_instance_type = var.machine_types["sidekiq-pullmirror"]
sidekiq_realtime_count = var.node_count["sidekiq-realtime"]
sidekiq_realtime_instance_type = var.machine_types["sidekiq-realtime"]
sidekiq_traces_count = var.node_count["sidekiq-traces"]
sidekiq_traces_instance_type = var.machine_types["sidekiq-traces"]
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v3.1.0"
tier = "sv"
use_new_node_name = true
......@@ -1899,9 +1897,9 @@ module "gitlab-gke" {
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/gke.git?ref=v7.0.0"
authorized_master_access = [
"35.229.103.65/32", # console-01-sv-gprd
"35.227.116.144/32", # ops.gitlab.net
"35.185.18.176/32", # runner-01-inf-ops
"35.229.103.65/32", # console-01-sv-gprd
"35.227.116.144/32", # ops.gitlab.net
"35.185.18.176/32", # runner-01-inf-ops
]
ip_cidr_range = var.subnetworks["gitlab-gke"]
......
......@@ -354,7 +354,6 @@ variable "machine_types" {
"sidekiq-pipeline" = "custom-8-15360"
"sidekiq-pullmirror" = "n1-standard-4"
"sidekiq-realtime" = "n1-standard-8"
"sidekiq-traces" = "n1-standard-8"
"stor" = "n1-standard-32"
"thanos-compact" = "n1-highmem-16"
"thanos-store" = "n1-highmem-32"
......@@ -408,7 +407,6 @@ variable "node_count" {
"sidekiq-pipeline" = 8
"sidekiq-pullmirror" = 5
"sidekiq-realtime" = 7
"sidekiq-traces" = 0
"stor" = 20
"thanos-compact" = 1
"thanos-store" = 2
......@@ -770,4 +768,3 @@ variable "sd_log_filters" {
"exclude_logtypes" = "resource.type=\"gce_instance\" AND (labels.tag:\"workhorse\" OR labels.tag:\"rails\" OR labels.tag:\"workhorse\" OR labels.tag:\"gitaly\")"
}
}
......@@ -756,8 +756,6 @@ module "sidekiq" {
sidekiq_pullmirror_instance_type = var.machine_types["sidekiq-pullmirror"]
sidekiq_realtime_count = var.node_count["sidekiq-realtime"]
sidekiq_realtime_instance_type = var.machine_types["sidekiq-realtime"]
sidekiq_traces_count = var.node_count["sidekiq-traces"]
sidekiq_traces_instance_type = var.machine_types["sidekiq-traces"]
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v3.1.0"
tier = "sv"
use_new_node_name = true
......@@ -1971,9 +1969,9 @@ module "gitlab-gke" {
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/gke.git?ref=v7.0.0"
authorized_master_access = [
"35.231.92.80/32", # console-01-sv-gstg
"35.227.116.144/32", # ops.gitlab.net
"35.185.18.176/32", # runner-01-inf-ops
"35.231.92.80/32", # console-01-sv-gstg
"35.227.116.144/32", # ops.gitlab.net
"35.185.18.176/32", # runner-01-inf-ops
]
ip_cidr_range = var.subnetworks["gitlab-gke"]
......@@ -2037,4 +2035,3 @@ resource "google_compute_firewall" "consul-deny-internal" {
]
}
}
......@@ -346,7 +346,6 @@ variable "machine_types" {
"sidekiq-pipeline" = "n1-standard-4"
"sidekiq-pullmirror" = "n1-standard-4"
"sidekiq-realtime" = "n1-standard-4"
"sidekiq-traces" = "n1-standard-4"
"stor" = "n1-standard-32"
"thanos-compact" = "n1-highmem-8"
"thanos-store" = "n1-highmem-8"
......@@ -401,7 +400,6 @@ variable "node_count" {
"sidekiq-pipeline" = 2
"sidekiq-pullmirror" = 1
"sidekiq-realtime" = 1
"sidekiq-traces" = 0
"stor" = 4
"stor-zfs" = 1
"thanos-compact" = 1
......@@ -749,4 +747,3 @@ variable "master_cidr_subnets" {
"gitlab-gke" = "172.16.0.0/28"
}
}
......@@ -780,8 +780,6 @@ module "sidekiq" {
sidekiq_pullmirror_instance_type = "none"
sidekiq_realtime_count = "0"
sidekiq_realtime_instance_type = "none"
sidekiq_traces_count = "0"
sidekiq_traces_instance_type = "none"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v3.0.2"
tier = "sv"
use_new_node_name = true
......@@ -867,4 +865,3 @@ module "thanos-store" {
use_new_node_name = true
vpc = module.network.self_link
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment