From f0f9b9a02888d15e8818371928a43c5437fc9c8a Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 10 Apr 2018 18:52:30 -0400
Subject: [PATCH] Ignore shared-ownership tags on volumes

We were otherwise logging a spurious warning message
---
 protokube/pkg/protokube/aws_volume.go  | 2 ++
 upup/pkg/fi/cloudup/awsup/aws_cloud.go | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/protokube/pkg/protokube/aws_volume.go b/protokube/pkg/protokube/aws_volume.go
index 274c92a519..337a1e4c62 100644
--- a/protokube/pkg/protokube/aws_volume.go
+++ b/protokube/pkg/protokube/aws_volume.go
@@ -226,6 +226,8 @@ func (a *AWSVolumes) findVolumes(request *ec2.DescribeVolumesInput) ([]*Volume,
 						vol.Info.EtcdClusters = append(vol.Info.EtcdClusters, spec)
 					} else if strings.HasPrefix(k, awsup.TagNameRolePrefix) {
 						// Ignore
+					} else if strings.HasPrefix(k, awsup.TagNameClusterOwnershipPrefix) {
+						// Ignore
 					} else {
 						glog.Warningf("unknown tag on volume %q: %s=%s", volumeID, k, v)
 					}
diff --git a/upup/pkg/fi/cloudup/awsup/aws_cloud.go b/upup/pkg/fi/cloudup/awsup/aws_cloud.go
index 538c7ecc80..60ca6d6d4d 100644
--- a/upup/pkg/fi/cloudup/awsup/aws_cloud.go
+++ b/upup/pkg/fi/cloudup/awsup/aws_cloud.go
@@ -77,6 +77,9 @@ const TagRoleMaster = "master"
 // TagNameKopsRole is the AWS tag used to identify the role an object plays for a cluster
 const TagNameKopsRole = "kubernetes.io/kops/role"
 
+// TagNameClusterOwnershipPrefix is the AWS tag used for ownership
+const TagNameClusterOwnershipPrefix = "kubernetes.io/cluster/"
+
 const (
 	WellKnownAccountKopeio = "383156758163"
 	WellKnownAccountRedhat = "309956199498"