Merge pull request #529 from justinsb/iam_sync_messaging

Better messaging during IAM replication
This commit is contained in:
Justin Santa Barbara 2016-09-28 00:17:57 -04:00 committed by GitHub
commit 6388a77fd4
1 changed files with 21 additions and 6 deletions

View File

@ -11,6 +11,7 @@ import (
"k8s.io/kops/upup/pkg/fi/cloudup/awsup" "k8s.io/kops/upup/pkg/fi/cloudup/awsup"
"k8s.io/kops/upup/pkg/fi/cloudup/terraform" "k8s.io/kops/upup/pkg/fi/cloudup/terraform"
"strings" "strings"
"time"
) )
//go:generate fitask -type=LaunchConfiguration //go:generate fitask -type=LaunchConfiguration
@ -255,18 +256,32 @@ func (_ *LaunchConfiguration) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *La
request.IamInstanceProfile = e.IAMInstanceProfile.Name request.IamInstanceProfile = e.IAMInstanceProfile.Name
} }
_, err = t.Cloud.Autoscaling().CreateLaunchConfiguration(request) maxAttempts := 6
attempt := 0
for {
attempt++
_, err = t.Cloud.Autoscaling().CreateLaunchConfiguration(request)
if err == nil {
break
}
if err != nil {
if awsup.AWSErrorCode(err) == "ValidationError" { if awsup.AWSErrorCode(err) == "ValidationError" {
message := awsup.AWSErrorMessage(err) message := awsup.AWSErrorMessage(err)
if strings.Contains(message, "not authorized") || strings.Contains(message, "Invalid IamInstance") { if strings.Contains(message, "not authorized") || strings.Contains(message, "Invalid IamInstance") {
// IAM instance profile creation is notoriously async if attempt == maxAttempts {
return fmt.Errorf("IAM instance profile not yet created/propagated") // IAM instance profile creation is notoriously async
return fmt.Errorf("IAM instance profile not yet created/propagated")
} else {
glog.Infof("Waiting for IAM to replicate")
glog.V(2).Infof("IAM error was %v", err)
time.Sleep(10 * time.Second)
continue
}
} }
glog.V(4).Infof("ErrorCode=%q, Message=%q", awsup.AWSErrorCode(err), awsup.AWSErrorMessage(err))
return fmt.Errorf("error creating AutoscalingLaunchConfiguration: %v", err)
} }
glog.V(4).Infof("ErrorCode=%q, Message=%q", awsup.AWSErrorCode(err), awsup.AWSErrorMessage(err))
return fmt.Errorf("error creating AutoscalingLaunchConfiguration: %v", err)
} }
e.ID = fi.String(launchConfigurationName) e.ID = fi.String(launchConfigurationName)