Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions lib/steps/aks.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,7 @@ func (s *AKSStep) deploy(ctx *pulumi.Context, target types.Target) error {
EnableSecureBoot: pulumi.Bool(false),
EnableVTPM: pulumi.Bool(false),
},
Tags: pulumi.StringMap{
"Owner": pulumi.String("ptd"),
},
Tags: buildResourceTags(config.ResourceTags),
Type: pulumi.String(containerservice.AgentPoolTypeVirtualMachineScaleSets),
UpgradeSettings: &containerservice.AgentPoolUpgradeSettingsArgs{
MaxSurge: pulumi.String("10%"),
Expand Down Expand Up @@ -267,9 +265,7 @@ func (s *AKSStep) deploy(ctx *pulumi.Context, target types.Target) error {
},
},
SupportPlan: pulumi.String("KubernetesOfficial"),
Tags: pulumi.StringMap{
"Owner": pulumi.String("ptd"),
},
Tags: buildResourceTags(config.ResourceTags),
}, pulumi.Protect(config.ProtectPersistentResources),
pulumi.IgnoreChanges(ignoreChanges))
if err != nil {
Expand Down Expand Up @@ -326,10 +322,8 @@ func (s *AKSStep) deploy(ctx *pulumi.Context, target types.Target) error {
OsSKU: pulumi.String(containerservice.OSSKUUbuntu),
OsType: pulumi.String(containerservice.OSTypeLinux),
ScaleDownMode: pulumi.String(containerservice.ScaleDownModeDelete),
Tags: pulumi.StringMap{
"Owner": pulumi.String("ptd"),
},
Type: pulumi.String(containerservice.AgentPoolTypeVirtualMachineScaleSets),
Tags: buildResourceTags(config.ResourceTags),
Type: pulumi.String(containerservice.AgentPoolTypeVirtualMachineScaleSets),
UpgradeSettings: &containerservice.AgentPoolUpgradeSettingsArgs{
MaxSurge: pulumi.String("10%"),
},
Expand Down Expand Up @@ -398,6 +392,16 @@ func toPulumiStringMap(m map[string]string) pulumi.StringMap {
return result
}

func buildResourceTags(resourceTags map[string]string) pulumi.StringMap {
tags := pulumi.StringMap{
"Owner": pulumi.String("ptd"),
}
Comment on lines +396 to +398
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ultra nit: it could be nice to pull this into a DefaultTags var or similar. 🤷

for k, v := range resourceTags {
tags[k] = pulumi.String(v)
}
return tags
}

func getPersistentStackOutputs(ctx context.Context, target types.Target) (auto.OutputMap, error) {
creds, err := target.Credentials(ctx)
if err != nil {
Expand Down
Loading