Skip to content

Commit 7f51aab

Browse files
jremy42jremy42
authored
Merge branch 'master' into v1.5538.0
2 parents 7cf0743 + 3e0ef52 commit 7f51aab

File tree

3 files changed

+191
-3
lines changed

3 files changed

+191
-3
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.22.2
77
require (
88
github.com/alecthomas/assert v1.0.0
99
github.com/aws/aws-sdk-go-v2 v1.31.0
10-
github.com/aws/aws-sdk-go-v2/service/s3 v1.64.0
10+
github.com/aws/aws-sdk-go-v2/service/s3 v1.64.1
1111
github.com/buildpacks/pack v0.34.2
1212
github.com/c-bata/go-prompt v0.2.6
1313
github.com/charmbracelet/bubbletea v1.1.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 h1:Xbwbmk44
9696
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20/go.mod h1:oAfOFzUB14ltPZj1rWwRc3d/6OgD76R8KlvU3EqM9Fg=
9797
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 h1:eb+tFOIl9ZsUe2259/BKPeniKuz4/02zZFH/i4Nf8Rg=
9898
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18/go.mod h1:GVCC2IJNJTmdlyEsSmofEy7EfJncP7DNnXDzRjJ5Keg=
99-
github.com/aws/aws-sdk-go-v2/service/s3 v1.64.0 h1:I0p8knB/IDYSQ3dbanaCr4UhiYQ96bvKRhGYxvLyiD8=
100-
github.com/aws/aws-sdk-go-v2/service/s3 v1.64.0/go.mod h1:NLTqRLe3pUNu3nTEHI6XlHLKYmc8fbHUdMxAB6+s41Q=
99+
github.com/aws/aws-sdk-go-v2/service/s3 v1.64.1 h1:jjHf+M6vCp/WzbyFEroY4/Nx8dJac520A0EPwlYk0Do=
100+
github.com/aws/aws-sdk-go-v2/service/s3 v1.64.1/go.mod h1:NLTqRLe3pUNu3nTEHI6XlHLKYmc8fbHUdMxAB6+s41Q=
101101
github.com/aws/aws-sdk-go-v2/service/sso v1.20.2 h1:XOPfar83RIRPEzfihnp+U6udOveKZJvPQ76SKWrLRHc=
102102
github.com/aws/aws-sdk-go-v2/service/sso v1.20.2/go.mod h1:Vv9Xyk1KMHXrR3vNQe8W5LMFdTjSeWk0gBZBzvf3Qa0=
103103
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.2 h1:pi0Skl6mNl2w8qWZXcdOyg197Zsf4G97U7Sso9JXGZE=

‎internal/namespaces/baremetal/v1/baremetal_cli.go‎

Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,100 @@ func baremetalServerCreate() *core.Command {
363363
Deprecated: false,
364364
Positional: false,
365365
},
366+
{
367+
Name: "install.partitioning-schema.disks.{index}.device",
368+
Required: false,
369+
Deprecated: false,
370+
Positional: false,
371+
},
372+
{
373+
Name: "install.partitioning-schema.disks.{index}.partitions.{index}.label",
374+
Required: false,
375+
Deprecated: false,
376+
Positional: false,
377+
EnumValues: []string{"unknown_partition_label", "uefi", "legacy", "root", "boot", "swap", "data", "home", "raid", "zfs"},
378+
},
379+
{
380+
Name: "install.partitioning-schema.disks.{index}.partitions.{index}.number",
381+
Required: false,
382+
Deprecated: false,
383+
Positional: false,
384+
},
385+
{
386+
Name: "install.partitioning-schema.disks.{index}.partitions.{index}.size",
387+
Required: false,
388+
Deprecated: false,
389+
Positional: false,
390+
},
391+
{
392+
Name: "install.partitioning-schema.raids.{index}.name",
393+
Required: false,
394+
Deprecated: false,
395+
Positional: false,
396+
},
397+
{
398+
Name: "install.partitioning-schema.raids.{index}.level",
399+
Required: false,
400+
Deprecated: false,
401+
Positional: false,
402+
EnumValues: []string{"unknown_raid_level", "raid_level_0", "raid_level_1", "raid_level_5", "raid_level_6", "raid_level_10"},
403+
},
404+
{
405+
Name: "install.partitioning-schema.raids.{index}.devices.{index}",
406+
Required: false,
407+
Deprecated: false,
408+
Positional: false,
409+
},
410+
{
411+
Name: "install.partitioning-schema.filesystems.{index}.device",
412+
Required: false,
413+
Deprecated: false,
414+
Positional: false,
415+
},
416+
{
417+
Name: "install.partitioning-schema.filesystems.{index}.format",
418+
Required: false,
419+
Deprecated: false,
420+
Positional: false,
421+
EnumValues: []string{"unknown_format", "fat32", "ext4", "swap", "zfs", "xfs"},
422+
},
423+
{
424+
Name: "install.partitioning-schema.filesystems.{index}.mountpoint",
425+
Required: false,
426+
Deprecated: false,
427+
Positional: false,
428+
},
429+
{
430+
Name: "install.partitioning-schema.zfs.pools.{index}.name",
431+
Required: false,
432+
Deprecated: false,
433+
Positional: false,
434+
},
435+
{
436+
Name: "install.partitioning-schema.zfs.pools.{index}.type",
437+
Required: false,
438+
Deprecated: false,
439+
Positional: false,
440+
EnumValues: []string{"unknown_type", "no_raid", "mirror", "raidz1", "raidz2"},
441+
},
442+
{
443+
Name: "install.partitioning-schema.zfs.pools.{index}.devices.{index}",
444+
Required: false,
445+
Deprecated: false,
446+
Positional: false,
447+
},
448+
{
449+
Name: "install.partitioning-schema.zfs.pools.{index}.options.{index}",
450+
Required: false,
451+
Deprecated: false,
452+
Positional: false,
453+
},
454+
{
455+
Name: "install.partitioning-schema.zfs.pools.{index}.filesystem-options.{index}",
456+
Required: false,
457+
Deprecated: false,
458+
Positional: false,
459+
},
366460
{
367461
Name: "option-ids.{index}",
368462
Short: `IDs of options to enable on server`,
@@ -507,6 +601,100 @@ func baremetalServerInstall() *core.Command {
507601
Deprecated: false,
508602
Positional: false,
509603
},
604+
{
605+
Name: "partitioning-schema.disks.{index}.device",
606+
Required: false,
607+
Deprecated: false,
608+
Positional: false,
609+
},
610+
{
611+
Name: "partitioning-schema.disks.{index}.partitions.{index}.label",
612+
Required: false,
613+
Deprecated: false,
614+
Positional: false,
615+
EnumValues: []string{"unknown_partition_label", "uefi", "legacy", "root", "boot", "swap", "data", "home", "raid", "zfs"},
616+
},
617+
{
618+
Name: "partitioning-schema.disks.{index}.partitions.{index}.number",
619+
Required: false,
620+
Deprecated: false,
621+
Positional: false,
622+
},
623+
{
624+
Name: "partitioning-schema.disks.{index}.partitions.{index}.size",
625+
Required: false,
626+
Deprecated: false,
627+
Positional: false,
628+
},
629+
{
630+
Name: "partitioning-schema.raids.{index}.name",
631+
Required: false,
632+
Deprecated: false,
633+
Positional: false,
634+
},
635+
{
636+
Name: "partitioning-schema.raids.{index}.level",
637+
Required: false,
638+
Deprecated: false,
639+
Positional: false,
640+
EnumValues: []string{"unknown_raid_level", "raid_level_0", "raid_level_1", "raid_level_5", "raid_level_6", "raid_level_10"},
641+
},
642+
{
643+
Name: "partitioning-schema.raids.{index}.devices.{index}",
644+
Required: false,
645+
Deprecated: false,
646+
Positional: false,
647+
},
648+
{
649+
Name: "partitioning-schema.filesystems.{index}.device",
650+
Required: false,
651+
Deprecated: false,
652+
Positional: false,
653+
},
654+
{
655+
Name: "partitioning-schema.filesystems.{index}.format",
656+
Required: false,
657+
Deprecated: false,
658+
Positional: false,
659+
EnumValues: []string{"unknown_format", "fat32", "ext4", "swap", "zfs", "xfs"},
660+
},
661+
{
662+
Name: "partitioning-schema.filesystems.{index}.mountpoint",
663+
Required: false,
664+
Deprecated: false,
665+
Positional: false,
666+
},
667+
{
668+
Name: "partitioning-schema.zfs.pools.{index}.name",
669+
Required: false,
670+
Deprecated: false,
671+
Positional: false,
672+
},
673+
{
674+
Name: "partitioning-schema.zfs.pools.{index}.type",
675+
Required: false,
676+
Deprecated: false,
677+
Positional: false,
678+
EnumValues: []string{"unknown_type", "no_raid", "mirror", "raidz1", "raidz2"},
679+
},
680+
{
681+
Name: "partitioning-schema.zfs.pools.{index}.devices.{index}",
682+
Required: false,
683+
Deprecated: false,
684+
Positional: false,
685+
},
686+
{
687+
Name: "partitioning-schema.zfs.pools.{index}.options.{index}",
688+
Required: false,
689+
Deprecated: false,
690+
Positional: false,
691+
},
692+
{
693+
Name: "partitioning-schema.zfs.pools.{index}.filesystem-options.{index}",
694+
Required: false,
695+
Deprecated: false,
696+
Positional: false,
697+
},
510698
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZonePlWaw2, scw.ZonePlWaw3),
511699
},
512700
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {

0 commit comments

Comments
 (0)