Merge pull request #1612 from HotelsDotCom/v0.13.x

Tag instances with their etcd or kubernetes version
kubernetes-retired · May 31, 2019 · cd86e8f · cd86e8f
2 parents 15cfc3f + 50e7fad
commit cd86e8f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/builtin/files/stack-templates/etcd.json.tmpl b/builtin/files/stack-templates/etcd.json.tmpl
@@ -333,6 +333,11 @@
             "PropagateAtLaunch": "true",
             "Value": "owned"
           },
+          {
+            "Key": "kube-aws:etcd_version",
+            "PropagateAtLaunch": "true",
+            "Value": "{{ $.Etcd.Version }}"
+          },
           {
             "Key": "Name",
             "PropagateAtLaunch": "true",

diff --git a/pkg/model/stack_new.go b/pkg/model/stack_new.go
@@ -108,6 +108,7 @@ func NewControlPlaneStack(conf *Config, opts api.StackTemplateOptions, extras cl
 				conf.StackTags = make(map[string]string, 1)
 			}
 			conf.StackTags["kube-aws:version"] = VERSION
+			conf.StackTags["kube-aws:kubernetes_version"] = conf.K8sVer
 
 			stack.archivedFiles = extraController.ArchivedFiles
 			stack.CfnInitConfigSets = extraController.CfnInitConfigSets
@@ -262,6 +263,7 @@ func NewWorkerStack(conf *Config, npconf *NodePoolConfig, opts api.StackTemplate
 				npconf.StackTags = make(map[string]string, 1)
 			}
 			npconf.StackTags["kube-aws:version"] = VERSION
+			conf.StackTags["kube-aws:kubernetes_version"] = conf.K8sVer
 
 			for k, v := range extraWorker.NodeLabels {
 				npconf.NodeSettings.NodeLabels[k] = v