Skip to content

Commit 54063f6

Browse files
authored
chore(vpc): use TryDeletingPrivateNetwork function from the sdk-go (#4923)
1 parent 096232d commit 54063f6

File tree

7 files changed

+1683
-1421
lines changed

7 files changed

+1683
-1421
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/mattn/go-isatty v0.0.20
2424
github.com/moby/buildkit v0.13.2
2525
github.com/opencontainers/go-digest v1.0.0
26-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250725144419-de749e386a06
26+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250729162034-8db00eaf9654
2727
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2828
github.com/spf13/cobra v1.9.1
2929
github.com/spf13/pflag v1.0.7

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
466466
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
467467
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
468468
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
469-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250725144419-de749e386a06 h1:HLJAN1hyivE7jP5/0TRh4cNVWiVKJFjihBWGajSLLOk=
470-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250725144419-de749e386a06/go.mod h1:fw6BmcfYRs2BEHYW0c3/rR0JgZHvdx6uMYqpeUJx3Bc=
469+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250729162034-8db00eaf9654 h1:G5/4vYAsx2lv3FKJFho58m9aE3wgBrbyn7Z/Fds4opU=
470+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250729162034-8db00eaf9654/go.mod h1:fw6BmcfYRs2BEHYW0c3/rR0JgZHvdx6uMYqpeUJx3Bc=
471471
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
472472
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
473473
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.cassette.yaml

Lines changed: 166 additions & 158 deletions
Large diffs are not rendered by default.

internal/namespaces/k8s/v1/testdata/test-get-cluster-simple.golden

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
3-
ID 01e9681f-4250-499c-9404-193c057ebbda
3+
ID f1e8452c-2434-4cf8-a594-bf8f5abf44fb
44
Type kapsule
55
Name cli-test-get-cluster
66
Status creating
77
Version 1.32.3
88
Region fr-par
9-
OrganizationID 6867048b-fe12-4e96-835e-41c79a39604b
10-
ProjectID 6867048b-fe12-4e96-835e-41c79a39604b
9+
OrganizationID fa1e3217-dc80-42ac-85c3-3f034b78b552
10+
ProjectID fa1e3217-dc80-42ac-85c3-3f034b78b552
1111
Cni cilium
1212
Description -
13-
ClusterURL https://01e9681f-4250-499c-9404-193c057ebbda.api.k8s.fr-par.scw.cloud:6443
14-
DNSWildcard *.01e9681f-4250-499c-9404-193c057ebbda.nodes.k8s.fr-par.scw.cloud
13+
ClusterURL https://f1e8452c-2434-4cf8-a594-bf8f5abf44fb.api.k8s.fr-par.scw.cloud:6443
14+
DNSWildcard *.f1e8452c-2434-4cf8-a594-bf8f5abf44fb.nodes.k8s.fr-par.scw.cloud
1515
CreatedAt few seconds ago
1616
UpdatedAt few seconds ago
17-
UpgradeAvailable false
18-
PrivateNetworkID 13118fe8-dbbf-42b2-b83e-dabab5b7f92b
17+
UpgradeAvailable true
18+
PrivateNetworkID 463a6351-e4e2-491c-bb76-aebc7aabf253
1919
CommitmentEndsAt few seconds ago
2020
ACLAvailable true
2121
IamNodesGroupID -
22+
NewImagesEnabled false
23+
PodCidr -
24+
ServiceCidr -
2225

2326
Autoscaler configuration:
2427
ScaleDownDisabled false
@@ -46,22 +49,22 @@ GroupsPrefix -
4649

4750
Pools:
4851
ID NAME STATUS VERSION NODE TYPE MIN SIZE SIZE MAX SIZE AUTOSCALING AUTOHEALING ZONE
49-
03b8c28f-94a4-491f-b746-83789e1d24f0 default scaling 1.32.3 dev1_m 0 1 1 false false fr-par-1
52+
c63e3bfd-7a81-4e1c-8182-faf02c53ebe9 default scaling 1.32.3 dev1_m 0 1 1 false false fr-par-1
5053
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
5154
{
52-
"id": "01e9681f-4250-499c-9404-193c057ebbda",
55+
"id": "f1e8452c-2434-4cf8-a594-bf8f5abf44fb",
5356
"type": "kapsule",
5457
"name": "cli-test-get-cluster",
5558
"status": "creating",
5659
"version": "1.32.3",
5760
"region": "fr-par",
58-
"organization_id": "6867048b-fe12-4e96-835e-41c79a39604b",
59-
"project_id": "6867048b-fe12-4e96-835e-41c79a39604b",
61+
"organization_id": "fa1e3217-dc80-42ac-85c3-3f034b78b552",
62+
"project_id": "fa1e3217-dc80-42ac-85c3-3f034b78b552",
6063
"tags": [],
6164
"cni": "cilium",
6265
"description": "",
63-
"cluster_url": "https://01e9681f-4250-499c-9404-193c057ebbda.api.k8s.fr-par.scw.cloud:6443",
64-
"dns_wildcard": "*.01e9681f-4250-499c-9404-193c057ebbda.nodes.k8s.fr-par.scw.cloud",
66+
"cluster_url": "https://f1e8452c-2434-4cf8-a594-bf8f5abf44fb.api.k8s.fr-par.scw.cloud:6443",
67+
"dns_wildcard": "*.f1e8452c-2434-4cf8-a594-bf8f5abf44fb.nodes.k8s.fr-par.scw.cloud",
6568
"created_at": "1970-01-01T00:00:00.0Z",
6669
"updated_at": "1970-01-01T00:00:00.0Z",
6770
"autoscaler_config": {
@@ -83,7 +86,7 @@ ID NAME STATUS VERSION NODE TYPE MIN
8386
"day": "any"
8487
}
8588
},
86-
"upgrade_available": false,
89+
"upgrade_available": true,
8790
"feature_gates": [],
8891
"admission_plugins": [],
8992
"open_id_connect_config": {
@@ -96,13 +99,17 @@ ID NAME STATUS VERSION NODE TYPE MIN
9699
"required_claim": []
97100
},
98101
"apiserver_cert_sans": [],
99-
"private_network_id": "13118fe8-dbbf-42b2-b83e-dabab5b7f92b",
102+
"private_network_id": "463a6351-e4e2-491c-bb76-aebc7aabf253",
100103
"commitment_ends_at": "1970-01-01T00:00:00.0Z",
101104
"acl_available": true,
102105
"iam_nodes_group_id": "",
106+
"new_images_enabled": false,
107+
"pod_cidr": "",
108+
"service_cidr": "",
109+
"service_dns_ip": "",
103110
"pools": [
104111
{
105-
"id": "03b8c28f-94a4-491f-b746-83789e1d24f0",
112+
"id": "c63e3bfd-7a81-4e1c-8182-faf02c53ebe9",
106113
"name": "default",
107114
"status": "scaling",
108115
"version": "1.32.3",

0 commit comments

Comments
 (0)