Skip to content
Merged
Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

## Unreleased

### Breaking changes
- instancepool create: use public ip assignment - #901

### Features
### Bug fixes
### Improvements


## 1.98.0

### Features
Expand Down
35 changes: 24 additions & 11 deletions cmd/compute/instance_pool/instance_pool_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package instance_pool
import (
"fmt"
"os"
"slices"
"strings"

"github.com/spf13/cobra"
Expand Down Expand Up @@ -31,7 +32,7 @@ type instancePoolCreateCmd struct {
Description string `cli-usage:"Instance Pool description"`
DiskSize int64 `cli-usage:"managed Compute instances disk size"`
ElasticIPs []string `cli-flag:"elastic-ip" cli-short:"e" cli-usage:"managed Compute instances Elastic IP ADDRESS|ID (can be specified multiple times)"`
IPv6 bool `cli-flag:"ipv6" cli-short:"6" cli-usage:"enable IPv6 on managed Compute instances"`
PublicIPAssignment string `cli-flag:"public-ip" cli-usage:"Configures public IP assignment of the instance pool (none|inet4|dual). (default: inet4)"`
InstancePrefix string `cli-usage:"string to prefix managed Compute instances names with"`
InstanceType string `cli-usage:"managed Compute instances type (format: [FAMILY.]SIZE)"`
Labels map[string]string `cli-flag:"label" cli-usage:"Instance Pool label (format: key=value)"`
Expand Down Expand Up @@ -71,6 +72,18 @@ func (c *instancePoolCreateCmd) CmdRun(cmd *cobra.Command, _ []string) error {
return err
}

publicIPAssignment := v3.CreateInstancePoolRequestPublicIPAssignmentInet4
if c.PublicIPAssignment != "" {
if !slices.Contains([]v3.CreateInstancePoolRequestPublicIPAssignment{
v3.CreateInstancePoolRequestPublicIPAssignmentDual,
v3.CreateInstancePoolRequestPublicIPAssignmentInet4,
v3.CreateInstancePoolRequestPublicIPAssignmentNone,
}, v3.CreateInstancePoolRequestPublicIPAssignment(c.PublicIPAssignment)) {
return fmt.Errorf("error invalid public-ip: %s", c.PublicIPAssignment)
}
publicIPAssignment = v3.CreateInstancePoolRequestPublicIPAssignment(c.PublicIPAssignment)
}

template, err := compute.ResolveTemplate(ctx, client, c.Template, c.TemplateVisibility, c.Zone)
if err != nil {
return err
Expand All @@ -97,16 +110,16 @@ func (c *instancePoolCreateCmd) CmdRun(cmd *cobra.Command, _ []string) error {
sshKey := &v3.SSHKey{Name: c.SSHKey}

instancePoolReq := v3.CreateInstancePoolRequest{
Description: c.Description,
DiskSize: diskSize,
Ipv6Enabled: &c.IPv6,
InstancePrefix: c.InstancePrefix,
Labels: c.Labels,
MinAvailable: c.MinAvailable,
Name: c.Name,
SSHKey: sshKey,
Size: c.Size,
Template: &v3.Template{ID: template.ID},
Description: c.Description,
DiskSize: diskSize,
PublicIPAssignment: publicIPAssignment,
InstancePrefix: c.InstancePrefix,
Labels: c.Labels,
MinAvailable: c.MinAvailable,
Name: c.Name,
SSHKey: sshKey,
Size: c.Size,
Template: &v3.Template{ID: template.ID},
}

if l := len(c.AntiAffinityGroups); l > 0 {
Expand Down
38 changes: 20 additions & 18 deletions cmd/compute/instance_pool/instance_pool_show.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,25 @@ import (
)

type instancePoolShowOutput struct {
ID string `json:"id"`
Name string `json:"name"`
Description string `json:"description"`
InstanceType string `json:"instance_type"`
Template string `json:"template"`
Zone string `json:"zone"`
AntiAffinityGroups []string `json:"anti_affinity_groups" outputLabel:"Anti-Affinity Groups"`
SecurityGroups []string `json:"security_groups"`
PrivateNetworks []string `json:"private_networks"`
ElasticIPs []string `json:"elastic_ips" outputLabel:"Elastic IPs"`
IPv6 bool `json:"ipv6" outputLabel:"IPv6"`
SSHKey string `json:"ssh_key"`
Size int64 `json:"size"`
DiskSize string `json:"disk_size"`
InstancePrefix string `json:"instance_prefix"`
State string `json:"state"`
Labels map[string]string `json:"labels"`
Instances []string `json:"instances"`
ID string `json:"id"`
Name string `json:"name"`
Description string `json:"description"`
InstanceType string `json:"instance_type"`
Template string `json:"template"`
Zone string `json:"zone"`
AntiAffinityGroups []string `json:"anti_affinity_groups" outputLabel:"Anti-Affinity Groups"`
SecurityGroups []string `json:"security_groups"`
PrivateNetworks []string `json:"private_networks"`
ElasticIPs []string `json:"elastic_ips" outputLabel:"Elastic IPs"`
IPv6 bool `json:"ipv6" outputLabel:"IPv6"`
PublicIPAssignment v3.PublicIPAssignment `json:"public-ip" outputLabel:"Public IP"`
SSHKey string `json:"ssh_key"`
Size int64 `json:"size"`
DiskSize string `json:"disk_size"`
InstancePrefix string `json:"instance_prefix"`
State string `json:"state"`
Labels map[string]string `json:"labels"`
Instances []string `json:"instances"`
}

func (o *instancePoolShowOutput) Type() string { return "Instance Pool" }
Expand Down Expand Up @@ -104,6 +105,7 @@ func (c *instancePoolShowCmd) CmdRun(cmd *cobra.Command, _ []string) error {
ElasticIPs: make([]string, 0),
ID: instancePool.ID.String(),
IPv6: utils.DefaultBool(instancePool.Ipv6Enabled, false),
PublicIPAssignment: instancePool.PublicIPAssignment,
InstancePrefix: instancePool.InstancePrefix,
Instances: make([]string, 0),
Labels: func() (v map[string]string) {
Expand Down