kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4960 from justinsb/dont_spurious_log_on_shared_volume_tag 

Ignore shared-ownership tags on volumes
This commit is contained in:
k8s-ci-robot 2018-04-11 01:40:55 -07:00 committed by GitHub
parent 063afb28d7 f0f9b9a028
commit 99cf4b63e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protokube/pkg/protokube/aws_volume.go
View File

@ -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)
}

3
upup/pkg/fi/cloudup/awsup/aws_cloud.go
View File

@ -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"