From 6510561553dd543053f0e071cb67ff783fef9da0 Mon Sep 17 00:00:00 2001
From: Yusuke KUOKA <ykuoka@gmail.com>
Date: Fri, 8 Dec 2017 18:32:33 +0900
Subject: [PATCH] Correct values for the `kubernetes.io/cluster/<Cluster ID>`
 tags Resolves #1025

---
 core/controlplane/config/templates/stack-template.json | 6 +++---
 core/nodepool/config/templates/stack-template.json     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/controlplane/config/templates/stack-template.json b/core/controlplane/config/templates/stack-template.json
index 7cb603041..2fccae7a9 100644
--- a/core/controlplane/config/templates/stack-template.json
+++ b/core/controlplane/config/templates/stack-template.json
@@ -554,7 +554,7 @@
         }],
         "HostedZoneTags" : [{
           "Key": "kubernetes.io/cluster/{{$.ClusterName}}",
-          "Value": "true"
+          "Value": "owned"
         }]
       }
     },
@@ -664,7 +664,7 @@
           {
             "Key": "kubernetes.io/cluster/{{$.ClusterName}}",
             "PropagateAtLaunch": "true",
-            "Value": "true"
+            "Value": "owned"
           },
           {
             "Key": "Name",
@@ -1618,7 +1618,7 @@
         "Tags": [
           {
             "Key": "kubernetes.io/cluster/{{.ClusterName}}",
-            "Value": "true"
+            "Value": "owned"
           },
           {
             "Key": "Name",
diff --git a/core/nodepool/config/templates/stack-template.json b/core/nodepool/config/templates/stack-template.json
index 6735deaea..1e5a92496 100644
--- a/core/nodepool/config/templates/stack-template.json
+++ b/core/nodepool/config/templates/stack-template.json
@@ -144,7 +144,7 @@
           {
             "Key": "kubernetes.io/cluster/{{ .ClusterName }}",
             "PropagateAtLaunch": "true",
-            "Value": "true"
+            "Value": "owned"
           },
           {
             "Key": "kube-aws:node-pool:name",