github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41702 from justinsb/fix_34583

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 38676, 41765, 42103, 41833, 41702)

AWS: Skip instances that are taggged as a master

We recognize a few AWS tags, and skip over masters when finding zones
for dynamic volumes.  This will fix #34583.

This is not perfect, in that really the scheduler is the only component
that can correctly choose the zone, but should address the common
problem.

```release-note
AWS: Do not consider master instance zones for dynamic volume creation
```
This commit is contained in:
Kubernetes Submit Queue 2017-03-01 01:44:12 -08:00 committed by GitHub
commit 7592564505
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/cloudprovider/providers/aws/aws.go
View File

@ -157,6 +157,10 @@ const (
createTagSteps = 9 createTagSteps = 9
) )
// awsTagNameMasterRoles is a set of well-known AWS tag names that indicate the instance is a master
// The major consequence is that it is then not considered for AWS zone discovery for dynamic volume creation.
var awsTagNameMasterRoles = sets.NewString("kubernetes.io/role/master", "k8s.io/role/master")
// Maps from backend protocol to ELB protocol // Maps from backend protocol to ELB protocol
var backendProtocolMapping = map[string]string{ var backendProtocolMapping = map[string]string{
"https": "https", "https": "https",
@ -1066,9 +1070,9 @@ func (c *Cloud) getInstancesByRegex(regex string) ([]types.NodeName, error) {
return matchingInstances, nil return matchingInstances, nil
} }
// getAllZones retrieves a list of all the zones in which nodes are running // getCandidateZonesForDynamicVolume retrieves a list of all the zones in which nodes are running
// It currently involves querying all instances // It currently involves querying all instances
func (c *Cloud) getAllZones() (sets.String, error) { func (c *Cloud) getCandidateZonesForDynamicVolume() (sets.String, error) {
// We don't currently cache this; it is currently used only in volume // We don't currently cache this; it is currently used only in volume
// creation which is expected to be a comparatively rare occurrence. // creation which is expected to be a comparatively rare occurrence.
@ -1092,10 +1096,19 @@ func (c *Cloud) getAllZones() (sets.String, error) {
zones := sets.NewString() zones := sets.NewString()
for _, instance := range instances { for _, instance := range instances {
// Only return fully-ready instances when listing instances // We skip over master nodes, if the installation tool labels them with one of the well-known master labels
// (vs a query by name, where we will return it if we find it) // This avoids creating a volume in a zone where only the master is running - e.g. #34583
if orEmpty(instance.State.Name) == "pending" { // This is a short-term workaround until the scheduler takes care of zone selection
glog.V(2).Infof("Skipping EC2 instance (pending): %s", *instance.InstanceId) master := false
for _, tag := range instance.Tags {
tagKey := aws.StringValue(tag.Key)
if awsTagNameMasterRoles.Has(tagKey) {
master = true
}
}
if master {
glog.V(4).Infof("Ignoring master instance %q in zone discovery", aws.StringValue(instance.InstanceId))
continue continue
} }
@ -1609,7 +1622,7 @@ func (c *Cloud) DetachDisk(diskName KubernetesVolumeID, nodeName types.NodeName)
// CreateDisk implements Volumes.CreateDisk // CreateDisk implements Volumes.CreateDisk
func (c *Cloud) CreateDisk(volumeOptions *VolumeOptions) (KubernetesVolumeID, error) { func (c *Cloud) CreateDisk(volumeOptions *VolumeOptions) (KubernetesVolumeID, error) {
allZones, err := c.getAllZones() allZones, err := c.getCandidateZonesForDynamicVolume()
if err != nil { if err != nil {
return "", fmt.Errorf("error querying for all zones: %v", err) return "", fmt.Errorf("error querying for all zones: %v", err)
} }