Skip to content

Commit 786145e

Browse files
spaghettifunkspaghettifunk
authored
remove warnings and upgrade to terraform 0.13.5 (#11)
1 parent 4409ebb commit 786145e

File tree

11 files changed

+188
-188
lines changed

11 files changed

+188
-188
lines changed

‎controller.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ resource "kubernetes_service_account" "linkerd_controller" {
142142
metadata {
143143
name = local.linkerd_controller_name
144144
namespace = local.linkerd_namespace
145-
labels = merge(local.linkerd_label_control_plane_ns, {
145+
labels = merge(local.linkerd_label_control_plane_ns, {
146146
"linkerd.io/control-plane-component" = local.linkerd_component_controller_name
147147
})
148148
}
@@ -164,7 +164,7 @@ resource "kubernetes_deployment" "linkerd_controller" {
164164
metadata {
165165
name = local.linkerd_controller_name
166166
namespace = local.linkerd_namespace
167-
labels = merge(
167+
labels = merge(
168168
local.linkerd_label_control_plane_ns,
169169
local.linkerd_label_partof_version,
170170
{
@@ -210,18 +210,18 @@ resource "kubernetes_deployment" "linkerd_controller" {
210210
automount_service_account_token = var.automount_service_account_token
211211
init_container {
212212
name = local.linkerd_init_container_name
213-
image = local.linkerd_deployment_proxy_init_image
213+
image = local.linkerd_deployment_proxy_init_image
214214
args = [
215215
"--incoming-proxy-port",
216-
"${local.linkerd_deployment_incoming_proxy_port}",
216+
local.linkerd_deployment_incoming_proxy_port,
217217
"--outgoing-proxy-port",
218-
"${local.linkerd_deployment_outgoing_proxy_port}",
218+
local.linkerd_deployment_outgoing_proxy_port,
219219
"--proxy-uid",
220-
"${local.linkerd_deployment_proxy_uid}",
220+
local.linkerd_deployment_proxy_uid,
221221
"--inbound-ports-to-ignore",
222-
"${local.linkerd_deployment_proxy_control_port},${local.linkerd_deployment_admin_port}",
222+
local.linkerd_deployment_proxy_control_port, local.linkerd_deployment_admin_port,
223223
"--outbound-ports-to-ignore",
224-
"${local.linkerd_deployment_outbound_port}"
224+
local.linkerd_deployment_outbound_port
225225
]
226226
resources {
227227
limits {
@@ -243,7 +243,7 @@ resource "kubernetes_deployment" "linkerd_controller" {
243243
}
244244
container {
245245
name = "public-api"
246-
image = local.linkerd_deployment_controller_image
246+
image = local.linkerd_deployment_controller_image
247247
args = [
248248
"public-api",
249249
"-prometheus-url=http://linkerd-prometheus.linkerd.svc.cluster.local:9090",
@@ -323,7 +323,7 @@ resource "kubernetes_deployment" "linkerd_controller" {
323323
for_each = local.linkerd_deployment_container_env_variables
324324

325325
content {
326-
name = env.value["name"]
326+
name = env.value["name"]
327327
value = env.value["value"]
328328
}
329329
}
@@ -425,7 +425,7 @@ resource "kubernetes_service" "linkerd_controller_api" {
425425
metadata {
426426
name = "linkerd-controller-api"
427427
namespace = local.linkerd_namespace
428-
labels = merge(local.linkerd_label_control_plane_ns, {
428+
labels = merge(local.linkerd_label_control_plane_ns, {
429429
"linkerd.io/control-plane-component" = local.linkerd_component_controller_name
430430
})
431431
annotations = local.linkerd_annotation_created_by

‎crds.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ data "template_file" "crds" {
55
resource "null_resource" "crds" {
66

77
triggers = {
8-
manifest_sha1 = sha1("${data.template_file.crds.rendered}")
8+
manifest_sha1 = sha1(data.template_file.crds.rendered)
99
}
1010

1111
provisioner "local-exec" {
1212
command = "kubectl apply -f - <<EOF\n${data.template_file.crds.rendered}\nEOF"
1313
}
1414

1515
provisioner "local-exec" {
16-
when = "destroy"
17-
command = "kubectl delete -f - <<EOF\n${data.template_file.crds.rendered}\nEOF"
16+
when = destroy
17+
command = "kubectl delete -f ${path.module}/templates/crds.yaml"
1818
}
1919
}

‎destination.tf

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ resource "kubernetes_service_account" "linkerd_destination" {
6161
metadata {
6262
name = local.linkerd_destination_name
6363
namespace = local.linkerd_namespace
64-
labels = merge(local.linkerd_label_control_plane_ns, {
64+
labels = merge(local.linkerd_label_control_plane_ns, {
6565
"linkerd.io/control-plane-component" = local.linkerd_component_destination_name
6666
})
6767
}
@@ -77,7 +77,7 @@ resource "kubernetes_service" "linkerd_dst" {
7777
metadata {
7878
name = "linkerd-dst"
7979
namespace = local.linkerd_namespace
80-
labels = merge(local.linkerd_label_control_plane_ns, {
80+
labels = merge(local.linkerd_label_control_plane_ns, {
8181
"linkerd.io/control-plane-component" = local.linkerd_component_destination_name
8282
})
8383
annotations = local.linkerd_annotation_created_by
@@ -109,7 +109,7 @@ resource "kubernetes_deployment" "linkerd_destination" {
109109
metadata {
110110
name = local.linkerd_destination_name
111111
namespace = local.linkerd_namespace
112-
labels = merge(
112+
labels = merge(
113113
local.linkerd_label_control_plane_ns,
114114
local.linkerd_label_partof_version,
115115
{
@@ -155,18 +155,18 @@ resource "kubernetes_deployment" "linkerd_destination" {
155155
automount_service_account_token = var.automount_service_account_token
156156
init_container {
157157
name = local.linkerd_init_container_name
158-
image = local.linkerd_deployment_proxy_init_image
158+
image = local.linkerd_deployment_proxy_init_image
159159
args = [
160160
"--incoming-proxy-port",
161-
"${local.linkerd_deployment_incoming_proxy_port}",
161+
local.linkerd_deployment_incoming_proxy_port,
162162
"--outgoing-proxy-port",
163-
"${local.linkerd_deployment_outgoing_proxy_port}",
163+
local.linkerd_deployment_outgoing_proxy_port,
164164
"--proxy-uid",
165-
"${local.linkerd_deployment_proxy_uid}",
165+
local.linkerd_deployment_proxy_uid,
166166
"--inbound-ports-to-ignore",
167-
"${local.linkerd_deployment_proxy_control_port},${local.linkerd_deployment_admin_port}",
167+
local.linkerd_deployment_proxy_control_port, local.linkerd_deployment_admin_port,
168168
"--outbound-ports-to-ignore",
169-
"${local.linkerd_deployment_outbound_port}"
169+
local.linkerd_deployment_outbound_port
170170
]
171171
resources {
172172
limits {
@@ -188,7 +188,7 @@ resource "kubernetes_deployment" "linkerd_destination" {
188188
}
189189
container {
190190
name = local.linkerd_component_destination_name
191-
image = local.linkerd_deployment_controller_image
191+
image = local.linkerd_deployment_controller_image
192192
args = [
193193
local.linkerd_component_destination_name,
194194
"-addr=:8086",
@@ -268,7 +268,7 @@ resource "kubernetes_deployment" "linkerd_destination" {
268268
for_each = local.linkerd_deployment_container_env_variables
269269

270270
content {
271-
name = env.value["name"]
271+
name = env.value["name"]
272272
value = env.value["value"]
273273
}
274274
}
@@ -321,29 +321,29 @@ resource "kubernetes_deployment" "linkerd_destination" {
321321

322322
content {
323323
pod_anti_affinity {
324-
required_during_scheduling_ignored_during_execution {
325-
label_selector {
326-
match_expressions {
327-
key = "linkerd.io/control-plane-component"
328-
operator = "In"
329-
values = [local.linkerd_component_destination_name]
330-
}
331-
}
332-
topology_key = "kubernetes.io/hostname"
324+
required_during_scheduling_ignored_during_execution {
325+
label_selector {
326+
match_expressions {
327+
key = "linkerd.io/control-plane-component"
328+
operator = "In"
329+
values = [local.linkerd_component_destination_name]
330+
}
333331
}
334-
preferred_during_scheduling_ignored_during_execution {
335-
weight = 100
336-
pod_affinity_term {
337-
label_selector {
338-
match_expressions {
339-
key = "linkerd.io/control-plane-component"
340-
operator = "In"
341-
values = [local.linkerd_component_destination_name]
342-
}
343-
}
344-
topology_key = "failure-domain.beta.kubernetes.io/zone"
332+
topology_key = "kubernetes.io/hostname"
333+
}
334+
preferred_during_scheduling_ignored_during_execution {
335+
weight = 100
336+
pod_affinity_term {
337+
label_selector {
338+
match_expressions {
339+
key = "linkerd.io/control-plane-component"
340+
operator = "In"
341+
values = [local.linkerd_component_destination_name]
345342
}
343+
}
344+
topology_key = "failure-domain.beta.kubernetes.io/zone"
346345
}
346+
}
347347
}
348348
}
349349
}

‎grafana.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ resource "kubernetes_service_account" "linkerd_grafana" {
44
metadata {
55
name = local.linkerd_grafana_name
66
namespace = local.linkerd_namespace
7-
labels = merge(local.linkerd_label_control_plane_ns, {
7+
labels = merge(local.linkerd_label_control_plane_ns, {
88
"linkerd.io/control-plane-component" = local.linkerd_component_grafana_name
99
})
1010
}
@@ -20,7 +20,7 @@ resource "kubernetes_config_map" "linkerd_grafana_config" {
2020
metadata {
2121
name = "linkerd-grafana-config"
2222
namespace = local.linkerd_namespace
23-
labels = merge(local.linkerd_label_control_plane_ns, {
23+
labels = merge(local.linkerd_label_control_plane_ns, {
2424
"linkerd.io/control-plane-component" = local.linkerd_component_grafana_name
2525
})
2626
annotations = local.linkerd_annotation_created_by
@@ -41,7 +41,7 @@ resource "kubernetes_service" "linkerd_grafana" {
4141
metadata {
4242
name = local.linkerd_grafana_name
4343
namespace = local.linkerd_namespace
44-
labels = merge(local.linkerd_label_control_plane_ns, {
44+
labels = merge(local.linkerd_label_control_plane_ns, {
4545
"linkerd.io/control-plane-component" = local.linkerd_component_grafana_name
4646
})
4747
annotations = local.linkerd_annotation_created_by
@@ -71,7 +71,7 @@ resource "kubernetes_deployment" "linkerd_grafana" {
7171
metadata {
7272
name = local.linkerd_grafana_name
7373
namespace = local.linkerd_namespace
74-
labels = merge(
74+
labels = merge(
7575
local.linkerd_label_control_plane_ns,
7676
local.linkerd_label_partof_version,
7777
{
@@ -132,18 +132,18 @@ resource "kubernetes_deployment" "linkerd_grafana" {
132132
automount_service_account_token = var.automount_service_account_token
133133
init_container {
134134
name = local.linkerd_init_container_name
135-
image = local.linkerd_deployment_proxy_init_image
135+
image = local.linkerd_deployment_proxy_init_image
136136
args = [
137137
"--incoming-proxy-port",
138-
"${local.linkerd_deployment_incoming_proxy_port}",
138+
local.linkerd_deployment_incoming_proxy_port,
139139
"--outgoing-proxy-port",
140-
"${local.linkerd_deployment_outgoing_proxy_port}",
140+
local.linkerd_deployment_outgoing_proxy_port,
141141
"--proxy-uid",
142-
"${local.linkerd_deployment_proxy_uid}",
142+
local.linkerd_deployment_proxy_uid,
143143
"--inbound-ports-to-ignore",
144-
"${local.linkerd_deployment_proxy_control_port},${local.linkerd_deployment_admin_port}",
144+
local.linkerd_deployment_proxy_control_port, local.linkerd_deployment_admin_port,
145145
"--outbound-ports-to-ignore",
146-
"${local.linkerd_deployment_outbound_port}"
146+
local.linkerd_deployment_outbound_port
147147
]
148148
resources {
149149
limits {
@@ -246,7 +246,7 @@ resource "kubernetes_deployment" "linkerd_grafana" {
246246
for_each = local.linkerd_deployment_container_env_variables
247247

248248
content {
249-
name = env.value["name"]
249+
name = env.value["name"]
250250
value = env.value["value"]
251251
}
252252
}

‎identity.tf

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ resource "kubernetes_service_account" "linkerd_identity" {
5151
metadata {
5252
name = local.linkerd_identity_name
5353
namespace = local.linkerd_namespace
54-
labels = merge(local.linkerd_label_control_plane_ns, {
54+
labels = merge(local.linkerd_label_control_plane_ns, {
5555
"linkerd.io/control-plane-component" = local.linkerd_component_identity_name
5656
})
5757
}
@@ -68,7 +68,7 @@ resource "kubernetes_service" "linkerd_identity" {
6868
metadata {
6969
name = local.linkerd_identity_name
7070
namespace = local.linkerd_namespace
71-
labels = merge(local.linkerd_label_control_plane_ns, {
71+
labels = merge(local.linkerd_label_control_plane_ns, {
7272
"linkerd.io/control-plane-component" = local.linkerd_component_identity_name
7373
})
7474
annotations = local.linkerd_annotation_created_by
@@ -153,18 +153,18 @@ resource "kubernetes_deployment" "linkerd_identity" {
153153
automount_service_account_token = var.automount_service_account_token
154154
init_container {
155155
name = local.linkerd_init_container_name
156-
image = local.linkerd_deployment_proxy_init_image
156+
image = local.linkerd_deployment_proxy_init_image
157157
args = [
158158
"--incoming-proxy-port",
159-
"${local.linkerd_deployment_incoming_proxy_port}",
159+
local.linkerd_deployment_incoming_proxy_port,
160160
"--outgoing-proxy-port",
161-
"${local.linkerd_deployment_outgoing_proxy_port}",
161+
local.linkerd_deployment_outgoing_proxy_port,
162162
"--proxy-uid",
163-
"${local.linkerd_deployment_proxy_uid}",
163+
local.linkerd_deployment_proxy_uid,
164164
"--inbound-ports-to-ignore",
165-
"${local.linkerd_deployment_proxy_control_port},${local.linkerd_deployment_admin_port}",
165+
local.linkerd_deployment_proxy_control_port, local.linkerd_deployment_admin_port,
166166
"--outbound-ports-to-ignore",
167-
"${local.linkerd_deployment_outbound_port}"
167+
local.linkerd_deployment_outbound_port
168168
]
169169
resources {
170170
limits {
@@ -186,7 +186,7 @@ resource "kubernetes_deployment" "linkerd_identity" {
186186
}
187187
container {
188188
name = local.linkerd_component_identity_name
189-
image = local.linkerd_deployment_controller_image
189+
image = local.linkerd_deployment_controller_image
190190
args = [local.linkerd_component_identity_name, "-log-level=${local.linkerd_container_log_level}"]
191191
port {
192192
name = "grpc"
@@ -264,7 +264,7 @@ resource "kubernetes_deployment" "linkerd_identity" {
264264
for_each = local.linkerd_deployment_container_env_variables
265265

266266
content {
267-
name = env.value["name"]
267+
name = env.value["name"]
268268
value = env.value["value"]
269269
}
270270
}
@@ -306,7 +306,7 @@ resource "kubernetes_deployment" "linkerd_identity" {
306306
}
307307
image_pull_policy = "IfNotPresent"
308308
security_context {
309-
run_as_user = local.linkerd_deployment_proxy_uid
309+
run_as_user = local.linkerd_deployment_proxy_uid
310310
# read_only_root_filesystem = true
311311
}
312312
}
@@ -317,29 +317,29 @@ resource "kubernetes_deployment" "linkerd_identity" {
317317

318318
content {
319319
pod_anti_affinity {
320-
required_during_scheduling_ignored_during_execution {
321-
label_selector {
322-
match_expressions {
323-
key = "linkerd.io/control-plane-component"
324-
operator = "In"
325-
values = [local.linkerd_component_identity_name]
326-
}
327-
}
328-
topology_key = "kubernetes.io/hostname"
320+
required_during_scheduling_ignored_during_execution {
321+
label_selector {
322+
match_expressions {
323+
key = "linkerd.io/control-plane-component"
324+
operator = "In"
325+
values = [local.linkerd_component_identity_name]
326+
}
329327
}
330-
preferred_during_scheduling_ignored_during_execution {
331-
weight = 100
332-
pod_affinity_term {
333-
label_selector {
334-
match_expressions {
335-
key = "linkerd.io/control-plane-component"
336-
operator = "In"
337-
values = [local.linkerd_component_identity_name]
338-
}
339-
}
340-
topology_key = "failure-domain.beta.kubernetes.io/zone"
328+
topology_key = "kubernetes.io/hostname"
329+
}
330+
preferred_during_scheduling_ignored_during_execution {
331+
weight = 100
332+
pod_affinity_term {
333+
label_selector {
334+
match_expressions {
335+
key = "linkerd.io/control-plane-component"
336+
operator = "In"
337+
values = [local.linkerd_component_identity_name]
341338
}
339+
}
340+
topology_key = "failure-domain.beta.kubernetes.io/zone"
342341
}
342+
}
343343
}
344344
}
345345
}

0 commit comments

Comments
 (0)