instancepool: add min available support and Migrate to egoscale v3 #629

elkezza · 2024-08-20T10:56:38Z

Description

Added min available to both instance_pool_create.go and instance_pool_update.go and Migrate to egoscale v3k, however, there are some parts need to be reviewed like InstanceType in instance_pool_update.go which I was not sure how to be correctly implemented in egoscale v3.

Checklist

(For exoscale contributors)

Changelog updated (under Unreleased block)
Testing

Testing

I test to create new instance pool with min available 3 then I updated see the bellow output of the tests:

 go run . compute instance-pool create my-pool --size 4 --min-available 3
 ✔ Creating Instance Pool "my-pool"... 24s
┼──────────────────────┼──────────────────────────────────────┼
│    INSTANCE POOL     │                                      │
┼──────────────────────┼──────────────────────────────────────┼
│ ID                   │ 9c52ad25-9898-48c1-be9a-f90ce13575c2 │
│ Name                 │ my-pool                              │
│ Description          │                                      │
│ Instance Type        │ standard.medium                      │
│ Template             │ Linux Ubuntu 22.04 LTS 64-bit        │
│ Zone                 │ at-vie-1                             │
│ Anti-Affinity Groups │ n/a                                  │
│ Security Groups      │ n/a                                  │
│ Private Networks     │ n/a                                  │
│ Elastic IPs          │ n/a                                  │
│ IPv6                 │ false                                │
│ SSH Key              │ -                                    │
│ Size                 │ 4                                    │
│ Disk Size            │ 50 GiB                               │
│ Instance Prefix      │ pool                                 │
│ State                │ scaling-up                           │
│ Labels               │ n/a                                  │
│ Instances            │ pool-9c52a-dqhmy                     │
│                      │ pool-9c52a-pkwqs                     │
│                      │ pool-9c52a-iepbx                     │
│                      │ pool-9c52a-staqe                     │
┼──────────────────────┼──────────────────────────────────────┼


 go run . compute instance-pool update my-pool --min-available 4
 ✔ Updating Instance Pool "my-pool"... 0s
┼──────────────────────┼──────────────────────────────────────┼
│    INSTANCE POOL     │                                      │
┼──────────────────────┼──────────────────────────────────────┼
│ ID                   │ 9c52ad25-9898-48c1-be9a-f90ce13575c2 │
│ Name                 │ my-pool                              │
│ Description          │                                      │
│ Instance Type        │ standard.medium                      │
│ Template             │ Linux Ubuntu 22.04 LTS 64-bit        │
│ Zone                 │ at-vie-1                             │
│ Anti-Affinity Groups │ n/a                                  │
│ Security Groups      │ n/a                                  │
│ Private Networks     │ n/a                                  │
│ Elastic IPs          │ n/a                                  │
│ IPv6                 │ false                                │
│ SSH Key              │ -                                    │
│ Size                 │ 4                                    │
│ Disk Size            │ 50 GiB                               │
│ Instance Prefix      │ pool                                 │
│ State                │ updating                             │
│ Labels               │ n/a                                  │
│ Instances            │ pool-9c52a-dqhmy                     │
│                      │ pool-9c52a-pkwqs                     │
│                      │ pool-9c52a-iepbx                     │
│                      │ pool-9c52a-staqe                     │
┼──────────────────────┼──────────────────────────────────────┼

sauterp · 2024-08-20T14:35:56Z

cmd/instance_pool_update.go

 	Name               string            `cli-short:"n" cli-usage:"Instance Pool name"`
 	PrivateNetworks    []string          `cli-flag:"private-network" cli-usage:"managed Compute instances Private Network NAME|ID (can be specified multiple times)"`
-	SSHKey             string            `cli-flag:"ssh-key" cli-usage:"SSH key to deploy on managed Compute instances"`
+	SSHKey             string            `cli-flag:"ssh-key" cli-usage:"SSH key to deploy on managed Compute instances (can be specified multiple times)"`


missing an s after SSHKey

This one I kept, becuase, I was not sure if to make it more than ssh key or only one, usually user update more than ssk keys?

Similar to how it was done in #620, it should be SSHKeys and type is []string]. Then instead of setting updateReq.SSHKey (which accepts one SSH key), you set updateReq.SSHKeys.

Actually ignore my previous comment. This kind of change is out of scope of this PR, let's keep it focused instead. So just remove (can be specified multiple times) suffix in the flag usage as it is incorrect (you can only specify a single SSH key with this implementation).

sauterp · 2024-08-20T14:37:08Z

cmd/instance_pool_create.go

 	PrivateNetworks    []string          `cli-flag:"private-network" cli-usage:"managed Compute instances Private Network NAME|ID (can be specified multiple times)"`
-	SSHKey             string            `cli-flag:"ssh-key" cli-usage:"SSH key to deploy on managed Compute instances"`
+	SSHKeys            []string          `cli-flag:"ssh-key" cli-usage:"SSH key to deploy on managed Compute instances (can be specified multiple times)"`


Can you explain how this change is relevant to this PR?

I made it based on similar migration to v3 made by @pierre-emmanuelJ this was my reference: cc09480#:~:text=SSHKeys%20%20%20%20%20%20%20%20%20%20%20%20%5B%5Dstring%20%20%20%20%20%20%20%20%20%20%60cli%2Dflag%3A%22ssh%2Dkey%22%20cli%2Dusage%3A%22SSH%20key%20to%20deploy%20on%20the%20instance%20(can%20be%20specified%20multiple%20times)%22%60

See #629 (comment)

cmd/instance_pool_update.go

cmd/instance_pool_create.go

cmd/instance_pool_update.go

pierre-emmanuelJ · 2024-09-11T14:29:23Z

Thanks, @elkezza, for your effort on this change. I fixed Elastic IP and Instance Type.
You can re-run your test series on the command, to be able to tick again the PR testing checkbox.

pierre-emmanuelJ · 2024-09-11T14:35:28Z

cmd/instance_pool_create.go

+		return fmt.Errorf("error listing instance type: %w", err)
+	}
+
+	// c.InstanceType is never empty


To be checked if It's the case like Instance

elkezza · 2024-09-11T16:43:50Z

@pierre-emmanuelJ big thanks for the new improvement in the code, below are the test regarding these changes : )

❯ go run . compute instance-pool update my-pool --elastic-ip 85.217.175.225  --elastic-ip 85.217.174.116
 ✔ Updating Instance Pool "my-pool"... 0s
┼──────────────────────┼──────────────────────────────────────┼
│    INSTANCE POOL     │                                      │
┼──────────────────────┼──────────────────────────────────────┼
│ ID                   │ 8fa38a23-4891-4868-b39b-f55a7fe567fb │
│ Name                 │ my-pool                              │
│ Description          │                                      │
│ Instance Type        │ standard.medium                      │
│ Template             │ Linux Ubuntu 22.04 LTS 64-bit        │
│ Zone                 │ at-vie-1                             │
│ Anti-Affinity Groups │ n/a                                  │
│ Security Groups      │ n/a                                  │
│ Private Networks     │ n/a                                  │
│ Elastic IPs          │ 85.217.175.225                       │
│                      │ 85.217.174.116                       │
│ IPv6                 │ false                                │
│ SSH Key              │ -                                    │
│ Size                 │ 4                                    │
│ Disk Size            │ 50 GiB                               │
│ Instance Prefix      │ pool                                 │
│ State                │ updating                             │
│ Labels               │ n/a                                  │
│ Instances            │ pool-8fa38-geuxj                     │
│                      │ pool-8fa38-czrfn                     │
│                      │ pool-8fa38-iglia                     │
│                      │ pool-8fa38-hjapn                     │
┼──────────────────────┼──────────────────────────────────────┼
❯ go run . compute instance-pool update my-pool --elastic-ip 85.217.175.225  --elastic-ip 85.217.232.33
warning: Elastic IP 85.217.232.33 not found.
 ✔ Updating Instance Pool "my-pool"... 0s
┼──────────────────────┼──────────────────────────────────────┼
│    INSTANCE POOL     │                                      │
┼──────────────────────┼──────────────────────────────────────┼
│ ID                   │ 8fa38a23-4891-4868-b39b-f55a7fe567fb │
│ Name                 │ my-pool                              │
│ Description          │                                      │
│ Instance Type        │ standard.medium                      │
│ Template             │ Linux Ubuntu 22.04 LTS 64-bit        │
│ Zone                 │ at-vie-1                             │
│ Anti-Affinity Groups │ n/a                                  │
│ Security Groups      │ n/a                                  │
│ Private Networks     │ n/a                                  │
│ Elastic IPs          │ 85.217.175.225                       │
│ IPv6                 │ false                                │
│ SSH Key              │ -                                    │
│ Size                 │ 4                                    │
│ Disk Size            │ 50 GiB                               │
│ Instance Prefix      │ pool                                 │
│ State                │ updating                             │
│ Labels               │ n/a                                  │
│ Instances            │ pool-8fa38-geuxj                     │
│                      │ pool-8fa38-czrfn                     │
│                      │ pool-8fa38-iglia                     │
│                      │ pool-8fa38-hjapn                     │
┼──────────────────────┼──────────────────────────────────────┼



❯ go run . compute instance-pool update my-pool --instance-type standard.micro
 ✔ Updating Instance Pool "my-pool"... 0s
┼──────────────────────┼──────────────────────────────────────┼
│    INSTANCE POOL     │                                      │
┼──────────────────────┼──────────────────────────────────────┼
│ ID                   │ 8fa38a23-4891-4868-b39b-f55a7fe567fb │
│ Name                 │ my-pool                              │
│ Description          │                                      │
│ Instance Type        │ standard.micro                       │
│ Template             │ Linux Ubuntu 22.04 LTS 64-bit        │
│ Zone                 │ at-vie-1                             │
│ Anti-Affinity Groups │ n/a                                  │
│ Security Groups      │ n/a                                  │
│ Private Networks     │ n/a                                  │
│ Elastic IPs          │ n/a                                  │
│ IPv6                 │ false                                │
│ SSH Key              │ -                                    │
│ Size                 │ 4                                    │
│ Disk Size            │ 50 GiB                               │
│ Instance Prefix      │ pool                                 │
│ State                │ updating                             │
│ Labels               │ n/a                                  │
│ Instances            │ pool-8fa38-geuxj                     │
│                      │ pool-8fa38-czrfn                     │
│                      │ pool-8fa38-iglia                     │
│                      │ pool-8fa38-hjapn                     │
┼──────────────────────┼──────────────────────────────────────┼

…ale v3.

Signed-off-by: Pierre-Emmanuel Jacquier <[email protected]>

) # Description Added min available to both instance_pool_create.go and instance_pool_update.go and Migrate to egoscale v3k, however, there are some parts need to be reviewed like InstanceType in instance_pool_update.go which I was not sure how to be correctly implemented in egoscale v3. ## Checklist (For exoscale contributors) * [ ] Changelog updated (under *Unreleased* block) * [ ] Testing ## Testing I test to create new instance pool with min available 3 then I updated see the bellow output of the tests: ```bash go run . compute instance-pool create my-pool --size 4 --min-available 3 ✔ Creating Instance Pool "my-pool"... 24s ┼──────────────────────┼──────────────────────────────────────┼ │ INSTANCE POOL │ │ ┼──────────────────────┼──────────────────────────────────────┼ │ ID │ 9c52ad25-9898-48c1-be9a-f90ce13575c2 │ │ Name │ my-pool │ │ Description │ │ │ Instance Type │ standard.medium │ │ Template │ Linux Ubuntu 22.04 LTS 64-bit │ │ Zone │ at-vie-1 │ │ Anti-Affinity Groups │ n/a │ │ Security Groups │ n/a │ │ Private Networks │ n/a │ │ Elastic IPs │ n/a │ │ IPv6 │ false │ │ SSH Key │ - │ │ Size │ 4 │ │ Disk Size │ 50 GiB │ │ Instance Prefix │ pool │ │ State │ scaling-up │ │ Labels │ n/a │ │ Instances │ pool-9c52a-dqhmy │ │ │ pool-9c52a-pkwqs │ │ │ pool-9c52a-iepbx │ │ │ pool-9c52a-staqe │ ┼──────────────────────┼──────────────────────────────────────┼ go run . compute instance-pool update my-pool --min-available 4 ✔ Updating Instance Pool "my-pool"... 0s ┼──────────────────────┼──────────────────────────────────────┼ │ INSTANCE POOL │ │ ┼──────────────────────┼──────────────────────────────────────┼ │ ID │ 9c52ad25-9898-48c1-be9a-f90ce13575c2 │ │ Name │ my-pool │ │ Description │ │ │ Instance Type │ standard.medium │ │ Template │ Linux Ubuntu 22.04 LTS 64-bit │ │ Zone │ at-vie-1 │ │ Anti-Affinity Groups │ n/a │ │ Security Groups │ n/a │ │ Private Networks │ n/a │ │ Elastic IPs │ n/a │ │ IPv6 │ false │ │ SSH Key │ - │ │ Size │ 4 │ │ Disk Size │ 50 GiB │ │ Instance Prefix │ pool │ │ State │ updating │ │ Labels │ n/a │ │ Instances │ pool-9c52a-dqhmy │ │ │ pool-9c52a-pkwqs │ │ │ pool-9c52a-iepbx │ │ │ pool-9c52a-staqe │ ┼──────────────────────┼──────────────────────────────────────┼ ``` --------- Signed-off-by: Pierre-Emmanuel Jacquier <[email protected]> Co-authored-by: Pierre-Emmanuel Jacquier <[email protected]>

elkezza requested review from kobajagi and sauterp August 20, 2024 10:56

elkezza force-pushed the salehelkaza/sc-46617/cli-tf-instancepool-min-available-support branch from 1b025df to 1a06458 Compare August 20, 2024 14:07

sauterp reviewed Aug 20, 2024

View reviewed changes

sauterp reviewed Aug 22, 2024

View reviewed changes

cmd/instance_pool_update.go Outdated Show resolved Hide resolved

pierre-emmanuelJ reviewed Sep 10, 2024

View reviewed changes

cmd/instance_pool_create.go Outdated Show resolved Hide resolved

pierre-emmanuelJ reviewed Sep 10, 2024

View reviewed changes

cmd/instance_pool_create.go Outdated Show resolved Hide resolved

pierre-emmanuelJ reviewed Sep 10, 2024

View reviewed changes

cmd/instance_pool_update.go Outdated Show resolved Hide resolved

pierre-emmanuelJ force-pushed the salehelkaza/sc-46617/cli-tf-instancepool-min-available-support branch from 12c8dc2 to 20be0f7 Compare September 11, 2024 14:23

pierre-emmanuelJ reviewed Sep 11, 2024

View reviewed changes

elkezza requested review from sauterp and pierre-emmanuelJ September 11, 2024 16:44

sauterp approved these changes Sep 12, 2024

View reviewed changes

kobajagi approved these changes Sep 13, 2024

View reviewed changes

pierre-emmanuelJ approved these changes Sep 13, 2024

View reviewed changes

elkezza and others added 13 commits September 13, 2024 17:11

adding min-Available flag and immigrate into egoscale v3.

2082fa8

fixing the typo in ListElasticIPS.

3bf4814

running goimports.

dda1243

testing if the commented block trigger the gitHub action failure.

4d95a35

Adding MinAvailable to instance_pool_update.go and migrating to egosc…

e1f5ae2

…ale v3.

fixing some errors.

8c53c6a

fixing some errors.

7f3baf3

fixing using c.InstancePool instead of c.name errors.

3a6f47d

Uncommenting the ElasticIP.

381e7db

push after the new action change on the failing action.

f3ede83

fix the typo.

14dedb3

brining back to used only one sshkey.

144840a

fix eip and instance-type

9a3e1a6

Signed-off-by: Pierre-Emmanuel Jacquier <[email protected]>

pierre-emmanuelJ and others added 5 commits September 13, 2024 17:11

Bump egoscale and improve find elastic ip

a771b69

Signed-off-by: Pierre-Emmanuel Jacquier <[email protected]>

Update cmd/instance_pool_create.go

6ba673e

bump egoscale to latest release

7a850eb

Signed-off-by: Pierre-Emmanuel Jacquier <[email protected]>

Bump egoscale v3

387b11f

Signed-off-by: Pierre-Emmanuel Jacquier <[email protected]>

Add min-available flag to CLI in changelog

e37b482

elkezza force-pushed the salehelkaza/sc-46617/cli-tf-instancepool-min-available-support branch from a08634c to e37b482 Compare September 15, 2024 22:10

elkezza merged commit 3868b32 into master Sep 15, 2024
2 checks passed

elkezza deleted the salehelkaza/sc-46617/cli-tf-instancepool-min-available-support branch September 15, 2024 22:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

instancepool: add min available support and Migrate to egoscale v3 #629

instancepool: add min available support and Migrate to egoscale v3 #629

elkezza commented Aug 20, 2024 •

edited by pierre-emmanuelJ

Loading

sauterp Aug 20, 2024

elkezza Aug 20, 2024

kobajagi Aug 20, 2024

kobajagi Aug 20, 2024 •

edited

Loading

elkezza Aug 21, 2024

sauterp Aug 20, 2024

elkezza Aug 20, 2024

kobajagi Aug 20, 2024

pierre-emmanuelJ commented Sep 11, 2024 •

edited

Loading

pierre-emmanuelJ Sep 11, 2024

elkezza commented Sep 11, 2024

instancepool: add min available support and Migrate to egoscale v3 #629

instancepool: add min available support and Migrate to egoscale v3 #629

Conversation

elkezza commented Aug 20, 2024 • edited by pierre-emmanuelJ Loading

Description

Checklist

Testing

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kobajagi Aug 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pierre-emmanuelJ commented Sep 11, 2024 • edited Loading

Choose a reason for hiding this comment

elkezza commented Sep 11, 2024

elkezza commented Aug 20, 2024 •

edited by pierre-emmanuelJ

Loading

kobajagi Aug 20, 2024 •

edited

Loading

pierre-emmanuelJ commented Sep 11, 2024 •

edited

Loading