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

Rename RoleType to ExportWithID in IAMRole 

Tweaks for #2508
This commit is contained in:
Justin Santa Barbara 2017-05-15 10:28:58 -04:00
parent d3fea46f7a
commit bde69b5b3e
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/iam.go
View File

@ -75,8 +75,8 @@ func (b *IAMModelBuilder) Build(c *fi.ModelBuilderContext) error {
iamRole = &awstasks.IAMRole{ iamRole = &awstasks.IAMRole{
Name: s(name), Name: s(name),
RoleType: s(b.InstanceGroupTypeName(role)),
RolePolicyDocument: fi.WrapResource(rolePolicy), RolePolicyDocument: fi.WrapResource(rolePolicy),
ExportWithID: s(strings.ToLower(string(role)) + "s"),
} }
c.AddTask(iamRole) c.AddTask(iamRole)

10
pkg/model/names.go
View File

@ -97,17 +97,13 @@ func (b *KopsModelContext) NameForDNSZone() string {
} }
func (b *KopsModelContext) IAMName(role kops.InstanceGroupRole) string { func (b *KopsModelContext) IAMName(role kops.InstanceGroupRole) string {
return b.InstanceGroupTypeName(role) + "s." + b.ClusterName()
}
func (b *KopsModelContext) InstanceGroupTypeName(role kops.InstanceGroupRole) string {
switch role { switch role {
case kops.InstanceGroupRoleMaster: case kops.InstanceGroupRoleMaster:
return "master" return "masters." + b.ClusterName()
case kops.InstanceGroupRoleBastion: case kops.InstanceGroupRoleBastion:
return "bastion" return "bastions." + b.ClusterName()
case kops.InstanceGroupRoleNode: case kops.InstanceGroupRoleNode:
return "node" return "nodes." + b.ClusterName()
default: default:
glog.Fatalf("unknown InstanceGroup Role: %q", role) glog.Fatalf("unknown InstanceGroup Role: %q", role)

10
upup/pkg/fi/cloudup/awstasks/iamrole.go
View File

@ -38,8 +38,10 @@ import (
type IAMRole struct { type IAMRole struct {
ID *string ID *string
Name *string Name *string
RoleType *string
RolePolicyDocument *fi.ResourceHolder // "inline" IAM policy RolePolicyDocument *fi.ResourceHolder // "inline" IAM policy
// ExportWithId will expose the name & ARN for reuse as part of a larger system. Only supported by terraform currently.
ExportWithID *string
} }
var _ fi.CompareWithID = &IAMRole{} var _ fi.CompareWithID = &IAMRole{}
@ -196,8 +198,10 @@ func (_ *IAMRole) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *I
AssumeRolePolicy: policy, AssumeRolePolicy: policy,
} }
t.AddOutputVariable(*e.RoleType+"s_role_arn", terraform.LiteralProperty("aws_iam_role", *e.Name, "arn")) if fi.StringValue(e.ExportWithID) != "" {
t.AddOutputVariable(*e.RoleType+"s_role_name", e.TerraformLink()) t.AddOutputVariable(*e.ExportWithID+"_role_arn", terraform.LiteralProperty("aws_iam_role", *e.Name, "arn"))
t.AddOutputVariable(*e.ExportWithID+"_role_name", e.TerraformLink())
}
return t.RenderResource("aws_iam_role", *e.Name, tf) return t.RenderResource("aws_iam_role", *e.Name, tf)
} }