Skip to content

Commit d483183

Browse files
yfodilyfodil
authored
Merge branch 'master' into v1.5635.0
2 parents a462e1e + 6a01239 commit d483183

File tree

2 files changed

+13
-50
lines changed

2 files changed

+13
-50
lines changed

‎internal/namespaces/block/v1alpha1/block_cli.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func blockVolumeTypeList() *core.Command {
8383
// Deprecated: false,
8484
ArgsType: reflect.TypeOf(block.ListVolumeTypesRequest{}),
8585
ArgSpecs: core.ArgSpecs{
86-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3, scw.Zone(core.AllLocalities)),
86+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3, scw.Zone(core.AllLocalities)),
8787
},
8888
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
8989
request := args.(*block.ListVolumeTypesRequest)
@@ -151,7 +151,7 @@ func blockVolumeList() *core.Command {
151151
Deprecated: false,
152152
Positional: false,
153153
},
154-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3, scw.Zone(core.AllLocalities)),
154+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3, scw.Zone(core.AllLocalities)),
155155
},
156156
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
157157
request := args.(*block.ListVolumesRequest)
@@ -227,7 +227,7 @@ To create a volume from an existing snapshot, specify ` + "`" + `from_snapshot`
227227
Deprecated: false,
228228
Positional: false,
229229
},
230-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3),
230+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
231231
},
232232
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
233233
request := args.(*block.CreateVolumeRequest)
@@ -257,7 +257,7 @@ func blockVolumeGet() *core.Command {
257257
Deprecated: false,
258258
Positional: true,
259259
},
260-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3),
260+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
261261
},
262262
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
263263
request := args.(*block.GetVolumeRequest)
@@ -287,7 +287,7 @@ func blockVolumeDelete() *core.Command {
287287
Deprecated: false,
288288
Positional: false,
289289
},
290-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3),
290+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
291291
},
292292
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
293293
request := args.(*block.DeleteVolumeRequest)
@@ -352,7 +352,7 @@ You can only resize a volume to a larger size. It is currently not possible to c
352352
Deprecated: false,
353353
Positional: false,
354354
},
355-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3),
355+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
356356
},
357357
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
358358
request := args.(*block.UpdateVolumeRequest)
@@ -411,7 +411,7 @@ func blockSnapshotList() *core.Command {
411411
Deprecated: false,
412412
Positional: false,
413413
},
414-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3, scw.Zone(core.AllLocalities)),
414+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3, scw.Zone(core.AllLocalities)),
415415
},
416416
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
417417
request := args.(*block.ListSnapshotsRequest)
@@ -450,7 +450,7 @@ func blockSnapshotGet() *core.Command {
450450
Deprecated: false,
451451
Positional: true,
452452
},
453-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3),
453+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
454454
},
455455
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
456456
request := args.(*block.GetSnapshotRequest)
@@ -496,7 +496,7 @@ If your volume is in a transient state, you need to wait until the end of the cu
496496
Deprecated: false,
497497
Positional: false,
498498
},
499-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3),
499+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
500500
},
501501
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
502502
request := args.(*block.CreateSnapshotRequest)
@@ -556,7 +556,7 @@ The bucket can be imported into any Availability Zone as long as it is in the sa
556556
Deprecated: false,
557557
Positional: false,
558558
},
559-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3),
559+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
560560
},
561561
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
562562
request := args.(*block.ImportSnapshotFromObjectStorageRequest)
@@ -601,7 +601,7 @@ The snapshot must not be in transient state.`,
601601
Deprecated: false,
602602
Positional: false,
603603
},
604-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3),
604+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
605605
},
606606
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
607607
request := args.(*block.ExportSnapshotToObjectStorageRequest)
@@ -631,7 +631,7 @@ func blockSnapshotDelete() *core.Command {
631631
Deprecated: false,
632632
Positional: false,
633633
},
634-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3),
634+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
635635
},
636636
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
637637
request := args.(*block.DeleteSnapshotRequest)
@@ -681,7 +681,7 @@ func blockSnapshotUpdate() *core.Command {
681681
Deprecated: false,
682682
Positional: false,
683683
},
684-
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw3),
684+
core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneFrPar3, scw.ZoneNlAms1, scw.ZoneNlAms2, scw.ZoneNlAms3, scw.ZonePlWaw1, scw.ZonePlWaw2, scw.ZonePlWaw3),
685685
},
686686
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
687687
request := args.(*block.UpdateSnapshotRequest)

‎internal/namespaces/k8s/v1/k8s_cli.go‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func GetGeneratedCommands() *core.Commands {
3636
k8sClusterListAvailableVersions(),
3737
k8sClusterListAvailableTypes(),
3838
k8sClusterResetAdminToken(),
39-
k8sClusterMigrateToRoutedIPs(),
4039
k8sClusterMigrateToSbsCsi(),
4140
k8sPoolList(),
4241
k8sPoolCreate(),
@@ -1161,42 +1160,6 @@ func k8sClusterResetAdminToken() *core.Command {
11611160
}
11621161
}
11631162

1164-
func k8sClusterMigrateToRoutedIPs() *core.Command {
1165-
return &core.Command{
1166-
Short: `Migrate a cluster to Routed IPs`,
1167-
Long: `Migrate the nodes of an existing cluster to Routed IPs and enable Routed IPs for all future nodes.`,
1168-
Namespace: "k8s",
1169-
Resource: "cluster",
1170-
Verb: "migrate-to-routed-ips",
1171-
// Deprecated: false,
1172-
ArgsType: reflect.TypeOf(k8s.MigrateClusterToRoutedIPsRequest{}),
1173-
ArgSpecs: core.ArgSpecs{
1174-
{
1175-
Name: "cluster-id",
1176-
Short: `Cluster ID for which the routed ip will be enabled for the nodes`,
1177-
Required: true,
1178-
Deprecated: false,
1179-
Positional: true,
1180-
},
1181-
core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw),
1182-
},
1183-
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
1184-
request := args.(*k8s.MigrateClusterToRoutedIPsRequest)
1185-
1186-
client := core.ExtractClient(ctx)
1187-
api := k8s.NewAPI(client)
1188-
return api.MigrateClusterToRoutedIPs(request)
1189-
1190-
},
1191-
Examples: []*core.Example{
1192-
{
1193-
Short: "Migrate a cluster to Routed IPs",
1194-
Raw: `scw k8s cluster migrate-to-routed-ips 11111111-1111-1111-111111111111`,
1195-
},
1196-
},
1197-
}
1198-
}
1199-
12001163
func k8sClusterMigrateToSbsCsi() *core.Command {
12011164
return &core.Command{
12021165
Short: `Migrate a cluster to SBS CSI`,

0 commit comments

Comments
 (0)