Skip to content

Commit

Permalink
Removing the single_namespace services entirely
Browse files Browse the repository at this point in the history
  • Loading branch information
jnicholsthru committed Feb 28, 2020
1 parent c6fa8d4 commit 64d4bf9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 367 deletions.
183 changes: 0 additions & 183 deletions daemonset.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,186 +180,3 @@ resource "kubernetes_daemonset" "this" {

depends_on = ["kubernetes_namespace.this", "kubernetes_service_account.this"]
}

# Create a deployment for the service
resource "kubernetes_daemonset" "this_namespace_single" {
count = "${var.daemon_set ? 1 : 0}"

metadata {
name = "${var.name}"
namespace = "${var.namespace_name}"
}

spec {
selector {
app = "${var.name}"
}

template {
metadata {
annotations {
"sidecar.istio.io/inject" = false
"prometheus.io/port" = "9102"
"prometheus.io/scrape" = true
}

labels = [
{
terrafrom = "true"
},
{
app = "${var.name}"
},
]
}

spec = [
{
service_account_name = "${var.name}"
restart_policy = "Always"

volume = [
{
name = "stats-exporter-mapping-config"

config_map = {
name = "${var.name}-config"

items = [
{
key = "exporterConfiguration"
path = "mapping-config.yaml"
},
]
}
},
]

container = [
{
name = "${var.name}-statsd-sink"
image = "${var.exporter_image}:${var.exporter_image_tag}"
image_pull_policy = "${var.image_pull_policy}"

args = [
"-statsd.listen-address=:8125",
"-statsd.mapping-config=/statsd-exporter/mapping-config.yaml",
]

port = [
{
container_port = 9102
name = "metrics"
protocol = "TCP"
},
{
container_port = 8125
name = "listener"
protocol = "TCP"
},
]

volume_mount = [
{
mount_path = "/statsd-exporter/"
name = "stats-exporter-mapping-config"
read_only = true
},
]
},
{
name = "${var.name}"
image = "${var.ambassador_image}:${var.ambassador_image_tag}"
image_pull_policy = "${var.image_pull_policy}"
termination_message_path = "/dev/termination-log"

resources {
requests {
memory = "${var.resources_requests_memory}"
cpu = "${var.resources_requests_cpu}"
}

limits {
memory = "${var.resources_limits_memory}"
cpu = "${var.resources_limits_cpu}"
}
}

env = [
{
name = "AMBASSADOR_ID"
value = "${var.ambassador_id}"
},
{
name = "AMBASSADOR_DEBUG"
value = "${var.ambassador_debug}"
},
{
name = "AMBASSADOR_NAMESPACE"

value_from = {
field_ref = {
field_path = "${var.ambassador_namespace_name}"
}
}
},
]

port = [
{
name = "http"
container_port = 80
protocol = "TCP"
},
{
name = "https"
container_port = 443
protocol = "TCP"
},
{
name = "admin"
container_port = 8877
protocol = "TCP"
},
]

liveness_probe = [
{
initial_delay_seconds = 3
success_threshold = 1
timeout_seconds = 1

http_get = [
{
path = "/ambassador/v0/check_alive"
port = 8877
scheme = "HTTP"
},
]
},
]

readiness_probe = [
{
initial_delay_seconds = 3
success_threshold = 1
timeout_seconds = 1

http_get = [
{
path = "/ambassador/v0/check_ready"
port = 8877
scheme = "HTTP"
},
]
},
]
},
]
},
]
}
}

depends_on = ["kubernetes_namespace.this", "kubernetes_service_account.this"]
}
184 changes: 0 additions & 184 deletions deployment.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,187 +181,3 @@ resource "kubernetes_deployment" "this" {

depends_on = ["kubernetes_namespace.this", "kubernetes_service_account.this"]
}

# Create a deployment for the service
resource "kubernetes_deployment" "this_namespace_single" {
count = "${! var.daemon_set ? 1 : 0}"

metadata {
name = "${var.name}"
namespace = "${var.namespace_name}"
}

spec {
replicas = "${var.replica_count}"

selector {
app = "${var.name}"
}

template {
metadata {
annotations {
"sidecar.istio.io/inject" = false
"prometheus.io/port" = "9102"
"prometheus.io/scrape" = true
}

labels {
terrafrom = "true"
}

labels {
app = "${var.name}"
}
}

spec = [
{
service_account_name = "${local.service_account_name}"
restart_policy = "Always"

volume = [
{
name = "stats-exporter-mapping-config"

config_map = {
name = "${var.name}-config"

items = [
{
key = "exporterConfiguration"
path = "mapping-config.yaml"
},
]
}
},
]

container = [
{
name = "${var.name}-statsd-sink"
image = "${var.exporter_image}:${var.exporter_image_tag}"
image_pull_policy = "${var.image_pull_policy}"

args = [
"-statsd.listen-address=:8125",
"-statsd.mapping-config=/statsd-exporter/mapping-config.yaml",
]

port = [
{
container_port = 9102
name = "metrics"
protocol = "TCP"
},
{
container_port = 8125
name = "listener"
protocol = "TCP"
},
]

volume_mount = [
{
mount_path = "/statsd-exporter/"
name = "stats-exporter-mapping-config"
read_only = true
},
]
},
{
name = "${var.name}"
image = "${var.ambassador_image}:${var.ambassador_image_tag}"
image_pull_policy = "${var.image_pull_policy}"
termination_message_path = "/dev/termination-log"

resources {
requests {
memory = "${var.resources_requests_memory}"
cpu = "${var.resources_requests_cpu}"
}

limits {
memory = "${var.resources_limits_memory}"
cpu = "${var.resources_limits_cpu}"
}
}

env = [
{
name = "AMBASSADOR_ID"
value = "${var.ambassador_id}"
},
{
name = "AMBASSADOR_DEBUG"
value = "${var.ambassador_debug}"
},
{
name = "AMBASSADOR_NAMESPACE"

value_from = {
field_ref = {
field_path = "${var.ambassador_namespace_name}"
}
}
},
]

port = [
{
name = "http"
container_port = 80
protocol = "TCP"
},
{
name = "https"
container_port = 443
protocol = "TCP"
},
{
name = "admin"
container_port = 8877
protocol = "TCP"
},
]

liveness_probe = [
{
initial_delay_seconds = 3
success_threshold = 1
timeout_seconds = 1

http_get = [
{
path = "/ambassador/v0/check_alive"
port = 8877
scheme = "HTTP"
},
]
},
]

readiness_probe = [
{
initial_delay_seconds = 3
success_threshold = 1
timeout_seconds = 1

http_get = [
{
path = "/ambassador/v0/check_ready"
port = 8877
scheme = "HTTP"
},
]
},
]
},
]
},
]
}
}

depends_on = ["kubernetes_namespace.this", "kubernetes_service_account.this"]
}

0 comments on commit 64d4bf9

Please sign in to comment.