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

Replace convenience functions with fi.* alternatives

This commit is contained in:
Ciprian Hacman 2021-04-30 11:26:48 +03:00
parent 8f0aa33131
commit bd7176f45f
8 changed files with 90 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/model/bootstrapscript_test.go
View File

@ -187,7 +187,7 @@ func makeTestCluster(hookSpecRoles []kops.InstanceGroupRole, fileAssetSpecRoles
Members: []kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "test", Name: "test",
InstanceGroup: s("ig-1"), InstanceGroup: fi.String("ig-1"),
}, },
}, },
Version: "3.1.11", Version: "3.1.11",
@ -197,7 +197,7 @@ func makeTestCluster(hookSpecRoles []kops.InstanceGroupRole, fileAssetSpecRoles
Members: []kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "test", Name: "test",
InstanceGroup: s("ig-1"), InstanceGroup: fi.String("ig-1"),
}, },
}, },
Version: "3.1.11", Version: "3.1.11",
@ -206,14 +206,14 @@ func makeTestCluster(hookSpecRoles []kops.InstanceGroupRole, fileAssetSpecRoles
}, },
NetworkCIDR: "10.79.0.0/24", NetworkCIDR: "10.79.0.0/24",
CloudConfig: &kops.CloudConfiguration{ CloudConfig: &kops.CloudConfiguration{
NodeTags: s("something"), NodeTags: fi.String("something"),
}, },
ContainerRuntime: "docker", ContainerRuntime: "docker",
Containerd: &kops.ContainerdConfig{ Containerd: &kops.ContainerdConfig{
LogLevel: s("info"), LogLevel: fi.String("info"),
}, },
Docker: &kops.DockerConfig{ Docker: &kops.DockerConfig{
LogLevel: s("INFO"), LogLevel: fi.String("INFO"),
}, },
KubeAPIServer: &kops.KubeAPIServerConfig{ KubeAPIServer: &kops.KubeAPIServerConfig{
Image: "CoreOS", Image: "CoreOS",

31
pkg/model/convenience.go
View File

@ -1,31 +0,0 @@
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package model
import (
"k8s.io/kops/upup/pkg/fi"
)
// s is a helper that builds a *string from a string value
func s(v string) *string {
return fi.String(v)
}
// i64 is a helper that builds a *int64 from an int64 value
func i64(v int64) *int64 {
return fi.Int64(v)
}

48
pkg/model/firewall.go
View File

@ -78,11 +78,11 @@ func (b *FirewallModelBuilder) buildNodeRules(c *fi.ModelBuilderContext) ([]Secu
// Allow full egress // Allow full egress
{ {
t := &awstasks.SecurityGroupRule{ t := &awstasks.SecurityGroupRule{
Name: s("node-egress" + src.Suffix), Name: fi.String("node-egress" + src.Suffix),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
SecurityGroup: src.Task, SecurityGroup: src.Task,
Egress: fi.Bool(true), Egress: fi.Bool(true),
CIDR: s("0.0.0.0/0"), CIDR: fi.String("0.0.0.0/0"),
} }
b.AddDirectionalGroupRule(c, t) b.AddDirectionalGroupRule(c, t)
} }
@ -92,7 +92,7 @@ func (b *FirewallModelBuilder) buildNodeRules(c *fi.ModelBuilderContext) ([]Secu
suffix := JoinSuffixes(src, dest) suffix := JoinSuffixes(src, dest)
t := &awstasks.SecurityGroupRule{ t := &awstasks.SecurityGroupRule{
Name: s("all-node-to-node" + suffix), Name: fi.String("all-node-to-node" + suffix),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
SecurityGroup: dest.Task, SecurityGroup: dest.Task,
SourceGroup: src.Task, SourceGroup: src.Task,
@ -159,25 +159,25 @@ func (b *FirewallModelBuilder) applyNodeToMasterBlockSpecificPorts(c *fi.ModelBu
for _, r := range udpRanges { for _, r := range udpRanges {
t := &awstasks.SecurityGroupRule{ t := &awstasks.SecurityGroupRule{
Name: s(fmt.Sprintf("node-to-master-udp-%d-%d%s", r.From, r.To, suffix)), Name: fi.String(fmt.Sprintf("node-to-master-udp-%d-%d%s", r.From, r.To, suffix)),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
SecurityGroup: masterGroup.Task, SecurityGroup: masterGroup.Task,
SourceGroup: nodeGroup.Task, SourceGroup: nodeGroup.Task,
FromPort: i64(int64(r.From)), FromPort: fi.Int64(int64(r.From)),
ToPort: i64(int64(r.To)), ToPort: fi.Int64(int64(r.To)),
Protocol: s("udp"), Protocol: fi.String("udp"),
} }
b.AddDirectionalGroupRule(c, t) b.AddDirectionalGroupRule(c, t)
} }
for _, r := range tcpRanges { for _, r := range tcpRanges {
t := &awstasks.SecurityGroupRule{ t := &awstasks.SecurityGroupRule{
Name: s(fmt.Sprintf("node-to-master-tcp-%d-%d%s", r.From, r.To, suffix)), Name: fi.String(fmt.Sprintf("node-to-master-tcp-%d-%d%s", r.From, r.To, suffix)),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
SecurityGroup: masterGroup.Task, SecurityGroup: masterGroup.Task,
SourceGroup: nodeGroup.Task, SourceGroup: nodeGroup.Task,
FromPort: i64(int64(r.From)), FromPort: fi.Int64(int64(r.From)),
ToPort: i64(int64(r.To)), ToPort: fi.Int64(int64(r.To)),
Protocol: s("tcp"), Protocol: fi.String("tcp"),
} }
b.AddDirectionalGroupRule(c, t) b.AddDirectionalGroupRule(c, t)
} }
@ -192,11 +192,11 @@ func (b *FirewallModelBuilder) applyNodeToMasterBlockSpecificPorts(c *fi.ModelBu
} }
t := &awstasks.SecurityGroupRule{ t := &awstasks.SecurityGroupRule{
Name: s(fmt.Sprintf("node-to-master-protocol-%s%s", name, suffix)), Name: fi.String(fmt.Sprintf("node-to-master-protocol-%s%s", name, suffix)),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
SecurityGroup: masterGroup.Task, SecurityGroup: masterGroup.Task,
SourceGroup: nodeGroup.Task, SourceGroup: nodeGroup.Task,
Protocol: s(awsName), Protocol: fi.String(awsName),
} }
b.AddDirectionalGroupRule(c, t) b.AddDirectionalGroupRule(c, t)
} }
@ -211,7 +211,7 @@ func (b *FirewallModelBuilder) applyNodeToMasterBlockSpecificPorts(c *fi.ModelBu
suffix := JoinSuffixes(src, dest) suffix := JoinSuffixes(src, dest)
t := &awstasks.SecurityGroupRule{ t := &awstasks.SecurityGroupRule{
Name: s("all-nodes-to-master" + suffix), Name: fi.String("all-nodes-to-master" + suffix),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
SecurityGroup: dest.Task, SecurityGroup: dest.Task,
SourceGroup: src.Task, SourceGroup: src.Task,
@ -238,11 +238,11 @@ func (b *FirewallModelBuilder) buildMasterRules(c *fi.ModelBuilderContext, nodeG
// Allow full egress // Allow full egress
{ {
t := &awstasks.SecurityGroupRule{ t := &awstasks.SecurityGroupRule{
Name: s("master-egress" + src.Suffix), Name: fi.String("master-egress" + src.Suffix),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
SecurityGroup: src.Task, SecurityGroup: src.Task,
Egress: fi.Bool(true), Egress: fi.Bool(true),
CIDR: s("0.0.0.0/0"), CIDR: fi.String("0.0.0.0/0"),
} }
b.AddDirectionalGroupRule(c, t) b.AddDirectionalGroupRule(c, t)
} }
@ -252,7 +252,7 @@ func (b *FirewallModelBuilder) buildMasterRules(c *fi.ModelBuilderContext, nodeG
suffix := JoinSuffixes(src, dest) suffix := JoinSuffixes(src, dest)
t := &awstasks.SecurityGroupRule{ t := &awstasks.SecurityGroupRule{
Name: s("all-master-to-master" + suffix), Name: fi.String("all-master-to-master" + suffix),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
SecurityGroup: dest.Task, SecurityGroup: dest.Task,
SourceGroup: src.Task, SourceGroup: src.Task,
@ -265,7 +265,7 @@ func (b *FirewallModelBuilder) buildMasterRules(c *fi.ModelBuilderContext, nodeG
suffix := JoinSuffixes(src, dest) suffix := JoinSuffixes(src, dest)
t := &awstasks.SecurityGroupRule{ t := &awstasks.SecurityGroupRule{
Name: s("all-master-to-node" + suffix), Name: fi.String("all-master-to-node" + suffix),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
SecurityGroup: dest.Task, SecurityGroup: dest.Task,
SourceGroup: src.Task, SourceGroup: src.Task,
@ -288,9 +288,9 @@ func (b *KopsModelContext) GetSecurityGroups(role kops.InstanceGroupRole) ([]Sec
if role == kops.InstanceGroupRoleMaster { if role == kops.InstanceGroupRoleMaster {
name := b.SecurityGroupName(role) name := b.SecurityGroupName(role)
baseGroup = &awstasks.SecurityGroup{ baseGroup = &awstasks.SecurityGroup{
Name: s(name), Name: fi.String(name),
VPC: b.LinkToVPC(), VPC: b.LinkToVPC(),
Description: s("Security group for masters"), Description: fi.String("Security group for masters"),
RemoveExtraRules: []string{ RemoveExtraRules: []string{
"port=22", // SSH "port=22", // SSH
"port=443", // k8s api "port=443", // k8s api
@ -310,18 +310,18 @@ func (b *KopsModelContext) GetSecurityGroups(role kops.InstanceGroupRole) ([]Sec
} else if role == kops.InstanceGroupRoleNode { } else if role == kops.InstanceGroupRoleNode {
name := b.SecurityGroupName(role) name := b.SecurityGroupName(role)
baseGroup = &awstasks.SecurityGroup{ baseGroup = &awstasks.SecurityGroup{
Name: s(name), Name: fi.String(name),
VPC: b.LinkToVPC(), VPC: b.LinkToVPC(),
Description: s("Security group for nodes"), Description: fi.String("Security group for nodes"),
RemoveExtraRules: []string{"port=22"}, RemoveExtraRules: []string{"port=22"},
} }
baseGroup.Tags = b.CloudTags(name, false) baseGroup.Tags = b.CloudTags(name, false)
} else if role == kops.InstanceGroupRoleBastion { } else if role == kops.InstanceGroupRoleBastion {
name := b.SecurityGroupName(role) name := b.SecurityGroupName(role)
baseGroup = &awstasks.SecurityGroup{ baseGroup = &awstasks.SecurityGroup{
Name: s(name), Name: fi.String(name),
VPC: b.LinkToVPC(), VPC: b.LinkToVPC(),
Description: s("Security group for bastion"), Description: fi.String("Security group for bastion"),
RemoveExtraRules: []string{"port=22"}, RemoveExtraRules: []string{"port=22"},
} }
baseGroup.Tags = b.CloudTags(name, false) baseGroup.Tags = b.CloudTags(name, false)

16
pkg/model/iam.go
View File

@ -155,7 +155,7 @@ func (b *IAMModelBuilder) buildIAMRole(role iam.Subject, iamName string, c *fi.M
} }
iamRole := &awstasks.IAMRole{ iamRole := &awstasks.IAMRole{
Name: s(iamName), Name: fi.String(iamName),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
RolePolicyDocument: rolePolicy, RolePolicyDocument: rolePolicy,
@ -164,10 +164,10 @@ func (b *IAMModelBuilder) buildIAMRole(role iam.Subject, iamName string, c *fi.M
if isServiceAccount { if isServiceAccount {
// e.g. kube-system-dns-controller // e.g. kube-system-dns-controller
iamRole.ExportWithID = s(roleKey) iamRole.ExportWithID = fi.String(roleKey)
} else { } else {
// e.g. nodes // e.g. nodes
iamRole.ExportWithID = s(roleKey + "s") iamRole.ExportWithID = fi.String(roleKey + "s")
} }
if b.Cluster.Spec.IAM != nil && b.Cluster.Spec.IAM.PermissionsBoundary != nil { if b.Cluster.Spec.IAM != nil && b.Cluster.Spec.IAM.PermissionsBoundary != nil {
@ -199,7 +199,7 @@ func (b *IAMModelBuilder) buildIAMRolePolicy(role iam.Subject, iamName string, i
} }
t := &awstasks.IAMRolePolicy{ t := &awstasks.IAMRolePolicy{
Name: s(iamName), Name: fi.String(iamName),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Role: iamRole, Role: iamRole,
@ -252,7 +252,7 @@ func (b *IAMModelBuilder) buildIAMTasks(role iam.Subject, iamName string, c *fi.
var iamInstanceProfile *awstasks.IAMInstanceProfile var iamInstanceProfile *awstasks.IAMInstanceProfile
{ {
iamInstanceProfile = &awstasks.IAMInstanceProfile{ iamInstanceProfile = &awstasks.IAMInstanceProfile{
Name: s(iamName), Name: fi.String(iamName),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Shared: fi.Bool(shared), Shared: fi.Bool(shared),
Tags: b.CloudTags(iamName, false), Tags: b.CloudTags(iamName, false),
@ -262,7 +262,7 @@ func (b *IAMModelBuilder) buildIAMTasks(role iam.Subject, iamName string, c *fi.
{ {
iamInstanceProfileRole := &awstasks.IAMInstanceProfileRole{ iamInstanceProfileRole := &awstasks.IAMInstanceProfileRole{
Name: s(iamName), Name: fi.String(iamName),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
InstanceProfile: iamInstanceProfile, InstanceProfile: iamInstanceProfile,
@ -283,7 +283,7 @@ func (b *IAMModelBuilder) buildIAMTasks(role iam.Subject, iamName string, c *fi.
name := fmt.Sprintf("%s-policyoverride", roleKey) name := fmt.Sprintf("%s-policyoverride", roleKey)
t := &awstasks.IAMRolePolicy{ t := &awstasks.IAMRolePolicy{
Name: s(name), Name: fi.String(name),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Role: iamRole, Role: iamRole,
Managed: true, Managed: true,
@ -305,7 +305,7 @@ func (b *IAMModelBuilder) buildIAMTasks(role iam.Subject, iamName string, c *fi.
additionalPolicyName := "additional." + iamName additionalPolicyName := "additional." + iamName
t := &awstasks.IAMRolePolicy{ t := &awstasks.IAMRolePolicy{
Name: s(additionalPolicyName), Name: fi.String(additionalPolicyName),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Role: iamRole, Role: iamRole,

30
pkg/model/master_volumes.go
View File

@ -183,19 +183,19 @@ func (b *MasterVolumeBuilder) addAWSVolume(c *fi.ModelBuilderContext, name strin
encrypted := fi.BoolValue(m.EncryptedVolume) encrypted := fi.BoolValue(m.EncryptedVolume)
t := &awstasks.EBSVolume{ t := &awstasks.EBSVolume{
Name: s(name), Name: fi.String(name),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
AvailabilityZone: s(zone), AvailabilityZone: fi.String(zone),
SizeGB: fi.Int64(int64(volumeSize)), SizeGB: fi.Int64(int64(volumeSize)),
VolumeType: s(volumeType), VolumeType: fi.String(volumeType),
KmsKeyId: m.KmsKeyId, KmsKeyId: m.KmsKeyId,
Encrypted: fi.Bool(encrypted), Encrypted: fi.Bool(encrypted),
Tags: tags, Tags: tags,
} }
switch volumeType { switch volumeType {
case ec2.VolumeTypeGp3: case ec2.VolumeTypeGp3:
t.VolumeThroughput = i64(int64(volumeThroughput)) t.VolumeThroughput = fi.Int64(int64(volumeThroughput))
fallthrough fallthrough
case ec2.VolumeTypeIo1, ec2.VolumeTypeIo2: case ec2.VolumeTypeIo1, ec2.VolumeTypeIo2:
t.VolumeIops = fi.Int64(int64(volumeIops)) t.VolumeIops = fi.Int64(int64(volumeIops))
@ -223,10 +223,10 @@ func (b *MasterVolumeBuilder) addDOVolume(c *fi.ModelBuilderContext, name string
tags[do.TagKubernetesClusterNamePrefix] = do.SafeClusterName(b.Cluster.ObjectMeta.Name) tags[do.TagKubernetesClusterNamePrefix] = do.SafeClusterName(b.Cluster.ObjectMeta.Name)
t := &dotasks.Volume{ t := &dotasks.Volume{
Name: s(name), Name: fi.String(name),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
SizeGB: fi.Int64(int64(volumeSize)), SizeGB: fi.Int64(int64(volumeSize)),
Region: s(zone), Region: fi.String(zone),
Tags: tags, Tags: tags,
} }
@ -268,12 +268,12 @@ func (b *MasterVolumeBuilder) addGCEVolume(c *fi.ModelBuilderContext, name strin
} }
t := &gcetasks.Disk{ t := &gcetasks.Disk{
Name: s(name), Name: fi.String(name),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Zone: s(zone), Zone: fi.String(zone),
SizeGB: fi.Int64(int64(volumeSize)), SizeGB: fi.Int64(int64(volumeSize)),
VolumeType: s(volumeType), VolumeType: fi.String(volumeType),
Labels: tags, Labels: tags,
} }
@ -299,9 +299,9 @@ func (b *MasterVolumeBuilder) addOpenstackVolume(c *fi.ModelBuilderContext, name
zone = fi.StringValue(b.Cluster.Spec.CloudConfig.Openstack.BlockStorage.OverrideAZ) zone = fi.StringValue(b.Cluster.Spec.CloudConfig.Openstack.BlockStorage.OverrideAZ)
} }
t := &openstacktasks.Volume{ t := &openstacktasks.Volume{
Name: s(name), Name: fi.String(name),
AvailabilityZone: s(zone), AvailabilityZone: fi.String(zone),
VolumeType: s(volumeType), VolumeType: fi.String(volumeType),
SizeGB: fi.Int64(int64(volumeSize)), SizeGB: fi.Int64(int64(volumeSize)),
Tags: tags, Tags: tags,
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
@ -338,10 +338,10 @@ func (b *MasterVolumeBuilder) addALIVolume(c *fi.ModelBuilderContext, name strin
t := &alitasks.Disk{ t := &alitasks.Disk{
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Name: s(name), Name: fi.String(name),
ZoneId: s(zone), ZoneId: fi.String(zone),
SizeGB: fi.Int(int(volumeSize)), SizeGB: fi.Int(int(volumeSize)),
DiskCategory: s(volumeType), DiskCategory: fi.String(volumeType),
Encrypted: fi.Bool(encrypted), Encrypted: fi.Bool(encrypted),
Tags: tags, Tags: tags,
} }

2
pkg/model/names.go
View File

@ -259,7 +259,7 @@ func (b *KopsModelContext) NamePrivateRouteTableInZone(zoneName string) string {
} }
func (b *KopsModelContext) LinkToPrivateRouteTableInZone(zoneName string) *awstasks.RouteTable { func (b *KopsModelContext) LinkToPrivateRouteTableInZone(zoneName string) *awstasks.RouteTable {
return &awstasks.RouteTable{Name: s(b.NamePrivateRouteTableInZone(zoneName))} return &awstasks.RouteTable{Name: fi.String(b.NamePrivateRouteTableInZone(zoneName))}
} }
func (b *KopsModelContext) InstanceName(ig *kops.InstanceGroup, suffix string) string { func (b *KopsModelContext) InstanceName(ig *kops.InstanceGroup, suffix string) string {

72
pkg/model/network.go
View File

@ -57,7 +57,7 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
vpcTags = nil vpcTags = nil
} }
t := &awstasks.VPC{ t := &awstasks.VPC{
Name: s(vpcName), Name: fi.String(vpcName),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Shared: fi.Bool(sharedVPC), Shared: fi.Bool(sharedVPC),
EnableDNSSupport: fi.Bool(true), EnableDNSSupport: fi.Bool(true),
@ -77,11 +77,11 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
} }
if b.Cluster.Spec.NetworkID != "" { if b.Cluster.Spec.NetworkID != "" {
t.ID = s(b.Cluster.Spec.NetworkID) t.ID = fi.String(b.Cluster.Spec.NetworkID)
} }
if b.Cluster.Spec.NetworkCIDR != "" { if b.Cluster.Spec.NetworkCIDR != "" {
t.CIDR = s(b.Cluster.Spec.NetworkCIDR) t.CIDR = fi.String(b.Cluster.Spec.NetworkCIDR)
} }
c.AddTask(t) c.AddTask(t)
@ -90,11 +90,11 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
if !sharedVPC { if !sharedVPC {
for _, cidr := range b.Cluster.Spec.AdditionalNetworkCIDRs { for _, cidr := range b.Cluster.Spec.AdditionalNetworkCIDRs {
c.AddTask(&awstasks.VPCCIDRBlock{ c.AddTask(&awstasks.VPCCIDRBlock{
Name: s(cidr), Name: fi.String(cidr),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
VPC: b.LinkToVPC(), VPC: b.LinkToVPC(),
Shared: fi.Bool(sharedVPC), Shared: fi.Bool(sharedVPC),
CIDRBlock: s(cidr), CIDRBlock: fi.String(cidr),
}) })
} }
} }
@ -102,22 +102,22 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
// TODO: would be good to create these as shared, to verify them // TODO: would be good to create these as shared, to verify them
if !sharedVPC { if !sharedVPC {
dhcp := &awstasks.DHCPOptions{ dhcp := &awstasks.DHCPOptions{
Name: s(b.ClusterName()), Name: fi.String(b.ClusterName()),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
DomainNameServers: s("AmazonProvidedDNS"), DomainNameServers: fi.String("AmazonProvidedDNS"),
Tags: tags, Tags: tags,
Shared: fi.Bool(sharedVPC), Shared: fi.Bool(sharedVPC),
} }
if b.Region == "us-east-1" { if b.Region == "us-east-1" {
dhcp.DomainName = s("ec2.internal") dhcp.DomainName = fi.String("ec2.internal")
} else { } else {
dhcp.DomainName = s(b.Region + ".compute.internal") dhcp.DomainName = fi.String(b.Region + ".compute.internal")
} }
c.AddTask(dhcp) c.AddTask(dhcp)
c.AddTask(&awstasks.VPCDHCPOptionsAssociation{ c.AddTask(&awstasks.VPCDHCPOptionsAssociation{
Name: s(b.ClusterName()), Name: fi.String(b.ClusterName()),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
VPC: b.LinkToVPC(), VPC: b.LinkToVPC(),
DHCPOptions: dhcp, DHCPOptions: dhcp,
@ -150,7 +150,7 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
if !allSubnetsUnmanaged { if !allSubnetsUnmanaged {
// The internet gateway is the main entry point to the cluster. // The internet gateway is the main entry point to the cluster.
igw := &awstasks.InternetGateway{ igw := &awstasks.InternetGateway{
Name: s(b.ClusterName()), Name: fi.String(b.ClusterName()),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
VPC: b.LinkToVPC(), VPC: b.LinkToVPC(),
Shared: fi.Bool(sharedVPC), Shared: fi.Bool(sharedVPC),
@ -166,7 +166,7 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
routeTableTags := b.CloudTags(vpcName, sharedRouteTable) routeTableTags := b.CloudTags(vpcName, sharedRouteTable)
routeTableTags[awsup.TagNameKopsRole] = "public" routeTableTags[awsup.TagNameKopsRole] = "public"
publicRouteTable = &awstasks.RouteTable{ publicRouteTable = &awstasks.RouteTable{
Name: s(b.ClusterName()), Name: fi.String(b.ClusterName()),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
VPC: b.LinkToVPC(), VPC: b.LinkToVPC(),
@ -178,9 +178,9 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
// TODO: Validate when allSubnetsShared // TODO: Validate when allSubnetsShared
c.AddTask(&awstasks.Route{ c.AddTask(&awstasks.Route{
Name: s("0.0.0.0/0"), Name: fi.String("0.0.0.0/0"),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
CIDR: s("0.0.0.0/0"), CIDR: fi.String("0.0.0.0/0"),
RouteTable: publicRouteTable, RouteTable: publicRouteTable,
InternetGateway: igw, InternetGateway: igw,
}) })
@ -216,18 +216,18 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
} }
subnet := &awstasks.Subnet{ subnet := &awstasks.Subnet{
Name: s(subnetName), Name: fi.String(subnetName),
ShortName: s(subnetSpec.Name), ShortName: fi.String(subnetSpec.Name),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
VPC: b.LinkToVPC(), VPC: b.LinkToVPC(),
AvailabilityZone: s(subnetSpec.Zone), AvailabilityZone: fi.String(subnetSpec.Zone),
CIDR: s(subnetSpec.CIDR), CIDR: fi.String(subnetSpec.CIDR),
Shared: fi.Bool(sharedSubnet), Shared: fi.Bool(sharedSubnet),
Tags: tags, Tags: tags,
} }
if subnetSpec.ProviderID != "" { if subnetSpec.ProviderID != "" {
subnet.ID = s(subnetSpec.ProviderID) subnet.ID = fi.String(subnetSpec.ProviderID)
} }
c.AddTask(subnet) c.AddTask(subnet)
@ -235,7 +235,7 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
case kops.SubnetTypePublic, kops.SubnetTypeUtility: case kops.SubnetTypePublic, kops.SubnetTypeUtility:
if !sharedSubnet && !isUnmanaged(subnetSpec) { if !sharedSubnet && !isUnmanaged(subnetSpec) {
c.AddTask(&awstasks.RouteTableAssociation{ c.AddTask(&awstasks.RouteTableAssociation{
Name: s(subnetSpec.Name + "." + b.ClusterName()), Name: fi.String(subnetSpec.Name + "." + b.ClusterName()),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
RouteTable: publicRouteTable, RouteTable: publicRouteTable,
Subnet: subnet, Subnet: subnet,
@ -250,7 +250,7 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
// //
// Map the Private subnet to the Private route table // Map the Private subnet to the Private route table
c.AddTask(&awstasks.RouteTableAssociation{ c.AddTask(&awstasks.RouteTableAssociation{
Name: s("private-" + subnetSpec.Name + "." + b.ClusterName()), Name: fi.String("private-" + subnetSpec.Name + "." + b.ClusterName()),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
RouteTable: b.LinkToPrivateRouteTableInZone(subnetSpec.Zone), RouteTable: b.LinkToPrivateRouteTableInZone(subnetSpec.Zone),
Subnet: subnet, Subnet: subnet,
@ -309,10 +309,10 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
if strings.HasPrefix(egress, "nat-") { if strings.HasPrefix(egress, "nat-") {
ngw = &awstasks.NatGateway{ ngw = &awstasks.NatGateway{
Name: s(zone + "." + b.ClusterName()), Name: fi.String(zone + "." + b.ClusterName()),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Subnet: utilitySubnet, Subnet: utilitySubnet,
ID: s(egress), ID: fi.String(egress),
AssociatedRouteTable: b.LinkToPrivateRouteTableInZone(zone), AssociatedRouteTable: b.LinkToPrivateRouteTableInZone(zone),
// If we're here, it means this NatGateway was specified, so we are Shared // If we're here, it means this NatGateway was specified, so we are Shared
Shared: fi.Bool(true), Shared: fi.Bool(true),
@ -324,8 +324,8 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
} else if strings.HasPrefix(egress, "eipalloc-") { } else if strings.HasPrefix(egress, "eipalloc-") {
eip := &awstasks.ElasticIP{ eip := &awstasks.ElasticIP{
Name: s(zone + "." + b.ClusterName()), Name: fi.String(zone + "." + b.ClusterName()),
ID: s(egress), ID: fi.String(egress),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
AssociatedNatGatewayRouteTable: b.LinkToPrivateRouteTableInZone(zone), AssociatedNatGatewayRouteTable: b.LinkToPrivateRouteTableInZone(zone),
Shared: fi.Bool(true), Shared: fi.Bool(true),
@ -334,7 +334,7 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
c.AddTask(eip) c.AddTask(eip)
ngw = &awstasks.NatGateway{ ngw = &awstasks.NatGateway{
Name: s(zone + "." + b.ClusterName()), Name: fi.String(zone + "." + b.ClusterName()),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Subnet: utilitySubnet, Subnet: utilitySubnet,
ElasticIP: eip, ElasticIP: eip,
@ -346,9 +346,9 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
} else if strings.HasPrefix(egress, "i-") { } else if strings.HasPrefix(egress, "i-") {
in = &awstasks.Instance{ in = &awstasks.Instance{
Name: s(egress), Name: fi.String(egress),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
ID: s(egress), ID: fi.String(egress),
Shared: fi.Bool(true), Shared: fi.Bool(true),
Tags: nil, // We don't need to add tags here Tags: nil, // We don't need to add tags here
} }
@ -368,13 +368,13 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
// subnet needs a NGW, lets create it. We tie it to a subnet // subnet needs a NGW, lets create it. We tie it to a subnet
// so we can track it in AWS // so we can track it in AWS
eip := &awstasks.ElasticIP{ eip := &awstasks.ElasticIP{
Name: s(zone + "." + b.ClusterName()), Name: fi.String(zone + "." + b.ClusterName()),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
AssociatedNatGatewayRouteTable: b.LinkToPrivateRouteTableInZone(zone), AssociatedNatGatewayRouteTable: b.LinkToPrivateRouteTableInZone(zone),
} }
if publicIP != "" { if publicIP != "" {
eip.PublicIP = s(publicIP) eip.PublicIP = fi.String(publicIP)
eip.Tags = b.CloudTags(*eip.Name, true) eip.Tags = b.CloudTags(*eip.Name, true)
} else { } else {
eip.Tags = b.CloudTags(*eip.Name, false) eip.Tags = b.CloudTags(*eip.Name, false)
@ -391,7 +391,7 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
//var ngw = &awstasks.NatGateway{} //var ngw = &awstasks.NatGateway{}
ngw = &awstasks.NatGateway{ ngw = &awstasks.NatGateway{
Name: s(zone + "." + b.ClusterName()), Name: fi.String(zone + "." + b.ClusterName()),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Subnet: utilitySubnet, Subnet: utilitySubnet,
ElasticIP: eip, ElasticIP: eip,
@ -410,7 +410,7 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
routeTableTags := b.CloudTags(b.NamePrivateRouteTableInZone(zone), routeTableShared) routeTableTags := b.CloudTags(b.NamePrivateRouteTableInZone(zone), routeTableShared)
routeTableTags[awsup.TagNameKopsRole] = "private-" + zone routeTableTags[awsup.TagNameKopsRole] = "private-" + zone
rt := &awstasks.RouteTable{ rt := &awstasks.RouteTable{
Name: s(b.NamePrivateRouteTableInZone(zone)), Name: fi.String(b.NamePrivateRouteTableInZone(zone)),
VPC: b.LinkToVPC(), VPC: b.LinkToVPC(),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
@ -427,9 +427,9 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
if in != nil { if in != nil {
r = &awstasks.Route{ r = &awstasks.Route{
Name: s("private-" + zone + "-0.0.0.0/0"), Name: fi.String("private-" + zone + "-0.0.0.0/0"),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
CIDR: s("0.0.0.0/0"), CIDR: fi.String("0.0.0.0/0"),
RouteTable: rt, RouteTable: rt,
Instance: in, Instance: in,
} }
@ -437,9 +437,9 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
} else { } else {
r = &awstasks.Route{ r = &awstasks.Route{
Name: s("private-" + zone + "-0.0.0.0/0"), Name: fi.String("private-" + zone + "-0.0.0.0/0"),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
CIDR: s("0.0.0.0/0"), CIDR: fi.String("0.0.0.0/0"),
RouteTable: rt, RouteTable: rt,
// Only one of these will be not nil // Only one of these will be not nil
NatGateway: ngw, NatGateway: ngw,

2
pkg/model/sshkey.go
View File

@ -39,7 +39,7 @@ func (b *SSHKeyModelBuilder) Build(c *fi.ModelBuilderContext) error {
return err return err
} }
t := &awstasks.SSHKey{ t := &awstasks.SSHKey{
Name: s(name), Name: fi.String(name),
Lifecycle: b.Lifecycle, Lifecycle: b.Lifecycle,
Tags: b.CloudTags(b.ClusterName(), false), Tags: b.CloudTags(b.ClusterName(), false),
Shared: fi.StringValue(b.Cluster.Spec.SSHKeyName) != "", Shared: fi.StringValue(b.Cluster.Spec.SSHKeyName) != "",