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

Include tags for volume resource and ssh key for droplet

This commit is contained in:
srikiz 2023-01-18 14:31:59 +05:30
parent 0360e170ea
commit 9fd9c1e1ef
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
upup/pkg/fi/cloudup/dotasks/droplet.go
View File

@ -239,6 +239,7 @@ func (_ *Droplet) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *D
Region: e.Region, Region: e.Region,
Name: e.Name, Name: e.Name,
Tags: e.Tags, Tags: e.Tags,
SSHKey: []string{fi.ValueOf(e.SSHKey)},
} }
userData, err := fi.ResourceAsString(e.UserData) userData, err := fi.ResourceAsString(e.UserData)

16
upup/pkg/fi/cloudup/dotasks/volume.go
View File

@ -132,16 +132,26 @@ func (_ *Volume) RenderDO(t *do.DOAPITarget, a, e, changes *Volume) error {
// terraformVolume represents the digitalocean_volume resource in terraform // terraformVolume represents the digitalocean_volume resource in terraform
// https://www.terraform.io/docs/providers/do/r/volume.html // https://www.terraform.io/docs/providers/do/r/volume.html
type terraformVolume struct { type terraformVolume struct {
Name *string `cty:"name"` Name *string `cty:"name"`
SizeGB *int64 `cty:"size"` SizeGB *int64 `cty:"size"`
Region *string `cty:"region"` Region *string `cty:"region"`
Tags []string `cty:"tags"`
} }
func (_ *Volume) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Volume) error { func (_ *Volume) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Volume) error {
tagArray := []string{}
for k, v := range e.Tags {
// DO tags don't accept =. Separate the key and value with an ":"
klog.V(10).Infof("DO - Join the volume tag - %s", fmt.Sprintf("%s:%s", k, v))
tagArray = append(tagArray, fmt.Sprintf("%s:%s", k, v))
}
tf := &terraformVolume{ tf := &terraformVolume{
Name: e.Name, Name: e.Name,
SizeGB: e.SizeGB, SizeGB: e.SizeGB,
Region: e.Region, Region: e.Region,
Tags: tagArray,
} }
return t.RenderResource("digitalocean_volume", *e.Name, tf) return t.RenderResource("digitalocean_volume", *e.Name, tf)
} }