Merge pull request #601 from alphagov/various-fixes

Various fixes following issues in Sandbox
alphagov · Oct 4, 2019 · 4e2c89c · 4e2c89c
2 parents 17b000c + 3e76e6e
commit 4e2c89c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/modules/k8s-cluster/security.tf b/modules/k8s-cluster/security.tf
@@ -8,10 +8,10 @@ resource "aws_security_group" "controller" {
 
   vpc_id = "${var.vpc_id}"
 
-  tags = {
-    "Name"                                      = "${var.cluster_name}-controller"
-    "kubernetes.io/cluster/${var.cluster_name}" = "owned"
-  }
+  tags = "${map(
+    "Name", "${var.cluster_name}-controller",
+    "kubernetes.io/cluster/${var.cluster_name}", "owned",
+  )}"
 }
 
 resource "aws_security_group_rule" "controller-apiserver-cidrs" {
@@ -82,10 +82,10 @@ resource "aws_security_group" "node" {
 
   vpc_id = "${var.vpc_id}"
 
-  tags = {
-    "Name"                                      = "${var.cluster_name}-node"
-    "kubernetes.io/cluster/${var.cluster_name}" = "owned"
-  }
+  tags = "${map(
+    "Name", "${var.cluster_name}-node",
+    "kubernetes.io/cluster/${var.cluster_name}", "owned",
+  )}"
 }
 
 resource "aws_security_group_rule" "node-egress" {
@@ -126,10 +126,9 @@ resource "aws_security_group" "worker" {
 
   vpc_id = "${var.vpc_id}"
 
-  tags = {
-    "Name"                                      = "${var.cluster_name}-worker"
-    "kubernetes.io/cluster/${var.cluster_name}" = "owned"
-  }
+  tags = "${map(
+    "Name", "${var.cluster_name}-worker",
+  )}"
 }
 
 resource "aws_security_group_rule" "workers-from-public" {

diff --git a/pipelines/tasks/generate-trusted-contributors.yaml b/pipelines/tasks/generate-trusted-contributors.yaml
@@ -1,5 +1,4 @@
 platform: linux
-image_resource:
 image_resource:
   type: docker-image
   source: