Skip to content

Commit 013d224

Browse files
authored
tests(k8s): delete additional resources (scaleway#4355)
1 parent 51046fa commit 013d224

12 files changed

+2784
-18212
lines changed

internal/namespaces/k8s/v1/helpers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,5 +155,5 @@ func createClusterAndWaitAndKubeconfigAndPopulateFileAndInstall(clusterNameSuffi
155155

156156
// deleteCluster deletes a cluster previously registered in the context Meta at metaKey.
157157
func deleteCluster(metaKey string) core.AfterFunc {
158-
return core.ExecAfterCmd("scw k8s cluster delete {{ ." + metaKey + ".ID }} --wait")
158+
return core.ExecAfterCmd("scw k8s cluster delete {{ ." + metaKey + ".ID }} with-additional-resources=true --wait")
159159
}

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

Lines changed: 60 additions & 240 deletions
Large diffs are not rendered by default.

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
3-
ID e96a93a2-c36f-42bb-b7e1-bebf52db7956
3+
ID d0e42582-6f68-4122-8f3b-f9f31efab2ec
44
Type kapsule
55
Name cli-test-get-cluster
66
Status creating
77
Version 1.27.1
88
Region fr-par
9-
OrganizationID fa1e3217-dc80-42ac-85c3-3f034b78b552
10-
ProjectID fa1e3217-dc80-42ac-85c3-3f034b78b552
9+
OrganizationID 564aa517-68b0-4fd7-8c8c-d21c4bcdcbd5
10+
ProjectID 564aa517-68b0-4fd7-8c8c-d21c4bcdcbd5
1111
Cni cilium
1212
Description -
13-
ClusterURL https://e96a93a2-c36f-42bb-b7e1-bebf52db7956.api.k8s.fr-par.scw.cloud:6443
14-
DNSWildcard *.e96a93a2-c36f-42bb-b7e1-bebf52db7956.nodes.k8s.fr-par.scw.cloud
13+
ClusterURL https://d0e42582-6f68-4122-8f3b-f9f31efab2ec.api.k8s.fr-par.scw.cloud:6443
14+
DNSWildcard *.d0e42582-6f68-4122-8f3b-f9f31efab2ec.nodes.k8s.fr-par.scw.cloud
1515
CreatedAt few seconds ago
1616
UpdatedAt few seconds ago
1717
UpgradeAvailable true
18-
PrivateNetworkID ac61c2ff-059a-4ce9-ab43-c8c70c85aef6
18+
PrivateNetworkID 42299907-e54a-4454-9afd-7146b9ab28d2
1919
CommitmentEndsAt few seconds ago
20+
SbsCsiEnabled true
2021

2122
Autoscaler configuration:
2223
ScaleDownDisabled false
@@ -44,22 +45,22 @@ GroupsPrefix -
4445

4546
Pools:
4647
ID NAME STATUS VERSION NODE TYPE MIN SIZE SIZE MAX SIZE AUTOSCALING AUTOHEALING ZONE
47-
1da2aa9e-463c-422a-b523-11274412dd5d default scaling 1.27.1 dev1_m 0 1 1 false false fr-par-1
48+
882057a6-66dc-4791-a964-d0aaa628020f default scaling 1.27.1 dev1_m 0 1 1 false false fr-par-1
4849
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
4950
{
50-
"id": "e96a93a2-c36f-42bb-b7e1-bebf52db7956",
51+
"id": "d0e42582-6f68-4122-8f3b-f9f31efab2ec",
5152
"type": "kapsule",
5253
"name": "cli-test-get-cluster",
5354
"status": "creating",
5455
"version": "1.27.1",
5556
"region": "fr-par",
56-
"organization_id": "fa1e3217-dc80-42ac-85c3-3f034b78b552",
57-
"project_id": "fa1e3217-dc80-42ac-85c3-3f034b78b552",
57+
"organization_id": "564aa517-68b0-4fd7-8c8c-d21c4bcdcbd5",
58+
"project_id": "564aa517-68b0-4fd7-8c8c-d21c4bcdcbd5",
5859
"tags": [],
5960
"cni": "cilium",
6061
"description": "",
61-
"cluster_url": "https://e96a93a2-c36f-42bb-b7e1-bebf52db7956.api.k8s.fr-par.scw.cloud:6443",
62-
"dns_wildcard": "*.e96a93a2-c36f-42bb-b7e1-bebf52db7956.nodes.k8s.fr-par.scw.cloud",
62+
"cluster_url": "https://d0e42582-6f68-4122-8f3b-f9f31efab2ec.api.k8s.fr-par.scw.cloud:6443",
63+
"dns_wildcard": "*.d0e42582-6f68-4122-8f3b-f9f31efab2ec.nodes.k8s.fr-par.scw.cloud",
6364
"created_at": "1970-01-01T00:00:00.0Z",
6465
"updated_at": "1970-01-01T00:00:00.0Z",
6566
"autoscaler_config": {
@@ -94,11 +95,12 @@ ID NAME STATUS VERSION NODE TYPE MIN
9495
"required_claim": []
9596
},
9697
"apiserver_cert_sans": [],
97-
"private_network_id": "ac61c2ff-059a-4ce9-ab43-c8c70c85aef6",
98+
"private_network_id": "42299907-e54a-4454-9afd-7146b9ab28d2",
9899
"commitment_ends_at": "1970-01-01T00:00:00.0Z",
100+
"sbs_csi_enabled": true,
99101
"pools": [
100102
{
101-
"id": "1da2aa9e-463c-422a-b523-11274412dd5d",
103+
"id": "882057a6-66dc-4791-a964-d0aaa628020f",
102104
"name": "default",
103105
"status": "scaling",
104106
"version": "1.27.1",

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

Lines changed: 284 additions & 2066 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
apiVersion: v1
44
clusters:
55
- cluster:
6-
certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJek1USXlOekUwTkRReE0xb1hEVE16TVRJeU56RTBORFF4TTFvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBSzkxCkdFbE1LcEVFTzlyc0FiT1grMGc2ZURHajhMbnpJbDBOK2V3WXdvL0owaUNqRDdPUmFUNGptWlZzK2h3Vnc0cmwKbUxoTE1DaVA2YUgvV0JreE01SlpFWm1BZnhFQWVZZ25oZkJQSVZaK3BsQ25FdTJwRlh1azc4dG5vQS9OTUt5TApFRHltSzBEUGxYQXZXbVVrMTNmMTdFQkNvTG93S0dIblNxeTZpek9yT2czYWdxSnRnYUhhUmFVeFVNQXRVdU5pClZjNHVyS3ZxZkFZK2xVTnBzTGdrYnNkekRxZmowemlVMExINjFxOFFwSHhPUHB4b29GSER6dm0zRWQvNG1HSWsKRzUzdGl4eWx3V3NYOGl1cDlyVWpZVnJIdGFXUnYyZnRzMTIxcU44YmhSdCtWMUtYMzhPRkhiUzFZeERnUHYregpBMFE5cjVmTDA1b1p3Sit1NkI4Q0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZBWEd3MTZSL0haT01kV1RMVDZYVFlCb0hlTHVNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCNElWWU4reXdSbERKbE9nU2lGbjM0d21VK1ZIdy82WVBCdGRGNXJpT2V4ZXo4TnNKVwpveTlQK1F1blBkM2cyaUNnTTBDS1JMb1BCVFZPNkUyZzIrcnpCUWFPY0ZvT1RnNXRGSlJscnlCSlJPcHE4R2QwCjBBR3BLbWpSWmFPQXB0bisvekllZzdva1FJdlFBMWh6aWpVd29lM0tEQ1d6NGhXVXR0b0tGRHIvRkRiUHBqemkKYXU5ZUNSMkpaUFhNQWVhcFdlQ2NyVmJzZ3V3ZWl2Y1NEZW90TXE0cXNWbXRXcjYvYVFJM3FCL3NCY0xleDFJTQpvQzB4c3gwQXhzSWphS1Jrc0JhS0FBWUtsc25IUTBjVkcvUHp3RFVnS1B0S25KdU1SQ2IvWGFQY3lqTHZLV2hSCjBRMGd2YUF3LzN6M1B3YUFSY2NUQ1NQSmF6VjNoTVI5Zy8xQwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
7-
server: https://7993085a-9a23-4e78-a8ca-e0ad1580f251.api.k8s.fr-par.scw.cloud:6443
6+
certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJME1USXhNVEUyTWpFd05Gb1hEVE0wTVRJeE1URTJNakV3TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTW1YCmFkSU9jNm1lYi8vUTd4UWZKWkI3bXpwVFBJZjhWNmVpSCtYTXlhUjRFVER4WTVUTGNIcEx2aERndzY3ckpvUUIKMHdMS2Jib0E0Ymg1UWdUTVc0dFlyaEl5eHdoVDR3V2pDRFlzaHFpZkJKTnI5ZGhuYTd0Zm4zNXFndHBJSHAxRApoQS8yTm13YWVkSExyZ2pPRWQyYko5b3JHMWNGaGpzVzdQVmNhWVhVL0crVFdGL0FXTjE3MDJIbGl0eFVkZi91CmlIQXRxbm9ISzRrVnlQQVpZWjZMY3czMmdFTHd2SDZpeURpS0M4OHprYm9hUktWYThoQXFCbk9xcTdNRUNlVmMKakhzM2Y1NFNhWTlUY1BqWS8xL01BOEc2Q1hIR3NTQ3U1LzIyZk9KU3I3ZkErN2RldkE3WTZaVG9VdnV4ZDlGTgpuMUNaRkIvWUJhcm4wUldueTlrQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZDQ094algzRWduVTIxbFlBbHR2WU5lVUdJZThNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFBRGtETWxWZ212QmhmdDRsRTk0N3I3UElwek9rTDcxZ0RSQlNtYm5PaDFETThRRTltWApWQWFRZGpiYjFmalVDSHdaNkRuSFFtTW1ENnN3Y1RDbnhXcHlRRDlVV1hUNnZIRmZjWnRkQjNiNHVmWEFwUG9IClNyaXp6UGZYQmMvNjJMOEtGd2d2WFVHU0FRNjZtMEFkUVRFY2d4VEFSMXRMZTlCZGwzNUdDNGlXS2ZVT2p6Q1MKNjFDTStxTUVIdS9iMmtiUm5RdEc5a2xpSFF4TXBYZWNXQnNRbkczV1J5aHc1ZXAxdEpyU0NmS2FjWUNGQTBMKwplWFN3VXQwOUV0ampieWhVMGx6T2Q2ckhtZUE5ZXAzVjZpL2NvcklUVlo0eG9YemdqNEdSVzVjdzltUWw5L0NmCnFPdVlNZDZITlk2eDNWMnQ4WngxL1RHVTZiYkxyRnJZL01OOAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
7+
server: https://cae75c17-a58f-40e5-9824-9c3e5df4be57.api.k8s.fr-par.scw.cloud:6443
88
name: cli-test-get-kubeconfig
99
contexts:
1010
- context:
@@ -17,7 +17,7 @@ preferences: {}
1717
users:
1818
- name: cli-test-get-kubeconfig-admin
1919
user:
20-
token: gnIzBSWlPZ4VElol2zG0fKyBztby26qaQShH2uka2iOmRtHNcAErTyhA
20+
token: YNBxaet5gE6Dpj1bcckNgcBHDPQMKe4JMy4cfLjFpH33NLHaNV0doMaq
2121

2222
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
23-
"apiVersion: v1\nclusters:\n- cluster:\n certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJek1USXlOekUwTkRReE0xb1hEVE16TVRJeU56RTBORFF4TTFvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBSzkxCkdFbE1LcEVFTzlyc0FiT1grMGc2ZURHajhMbnpJbDBOK2V3WXdvL0owaUNqRDdPUmFUNGptWlZzK2h3Vnc0cmwKbUxoTE1DaVA2YUgvV0JreE01SlpFWm1BZnhFQWVZZ25oZkJQSVZaK3BsQ25FdTJwRlh1azc4dG5vQS9OTUt5TApFRHltSzBEUGxYQXZXbVVrMTNmMTdFQkNvTG93S0dIblNxeTZpek9yT2czYWdxSnRnYUhhUmFVeFVNQXRVdU5pClZjNHVyS3ZxZkFZK2xVTnBzTGdrYnNkekRxZmowemlVMExINjFxOFFwSHhPUHB4b29GSER6dm0zRWQvNG1HSWsKRzUzdGl4eWx3V3NYOGl1cDlyVWpZVnJIdGFXUnYyZnRzMTIxcU44YmhSdCtWMUtYMzhPRkhiUzFZeERnUHYregpBMFE5cjVmTDA1b1p3Sit1NkI4Q0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZBWEd3MTZSL0haT01kV1RMVDZYVFlCb0hlTHVNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCNElWWU4reXdSbERKbE9nU2lGbjM0d21VK1ZIdy82WVBCdGRGNXJpT2V4ZXo4TnNKVwpveTlQK1F1blBkM2cyaUNnTTBDS1JMb1BCVFZPNkUyZzIrcnpCUWFPY0ZvT1RnNXRGSlJscnlCSlJPcHE4R2QwCjBBR3BLbWpSWmFPQXB0bisvekllZzdva1FJdlFBMWh6aWpVd29lM0tEQ1d6NGhXVXR0b0tGRHIvRkRiUHBqemkKYXU5ZUNSMkpaUFhNQWVhcFdlQ2NyVmJzZ3V3ZWl2Y1NEZW90TXE0cXNWbXRXcjYvYVFJM3FCL3NCY0xleDFJTQpvQzB4c3gwQXhzSWphS1Jrc0JhS0FBWUtsc25IUTBjVkcvUHp3RFVnS1B0S25KdU1SQ2IvWGFQY3lqTHZLV2hSCjBRMGd2YUF3LzN6M1B3YUFSY2NUQ1NQSmF6VjNoTVI5Zy8xQwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==\n server: https://7993085a-9a23-4e78-a8ca-e0ad1580f251.api.k8s.fr-par.scw.cloud:6443\n name: cli-test-get-kubeconfig\ncontexts:\n- context:\n cluster: cli-test-get-kubeconfig\n user: cli-test-get-kubeconfig-admin\n name: admin@cli-test-get-kubeconfig\ncurrent-context: admin@cli-test-get-kubeconfig\nkind: Config\npreferences: {}\nusers:\n- name: cli-test-get-kubeconfig-admin\n user:\n token: gnIzBSWlPZ4VElol2zG0fKyBztby26qaQShH2uka2iOmRtHNcAErTyhA\n"
23+
"apiVersion: v1\nclusters:\n- cluster:\n certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJME1USXhNVEUyTWpFd05Gb1hEVE0wTVRJeE1URTJNakV3TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTW1YCmFkSU9jNm1lYi8vUTd4UWZKWkI3bXpwVFBJZjhWNmVpSCtYTXlhUjRFVER4WTVUTGNIcEx2aERndzY3ckpvUUIKMHdMS2Jib0E0Ymg1UWdUTVc0dFlyaEl5eHdoVDR3V2pDRFlzaHFpZkJKTnI5ZGhuYTd0Zm4zNXFndHBJSHAxRApoQS8yTm13YWVkSExyZ2pPRWQyYko5b3JHMWNGaGpzVzdQVmNhWVhVL0crVFdGL0FXTjE3MDJIbGl0eFVkZi91CmlIQXRxbm9ISzRrVnlQQVpZWjZMY3czMmdFTHd2SDZpeURpS0M4OHprYm9hUktWYThoQXFCbk9xcTdNRUNlVmMKakhzM2Y1NFNhWTlUY1BqWS8xL01BOEc2Q1hIR3NTQ3U1LzIyZk9KU3I3ZkErN2RldkE3WTZaVG9VdnV4ZDlGTgpuMUNaRkIvWUJhcm4wUldueTlrQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZDQ094algzRWduVTIxbFlBbHR2WU5lVUdJZThNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFBRGtETWxWZ212QmhmdDRsRTk0N3I3UElwek9rTDcxZ0RSQlNtYm5PaDFETThRRTltWApWQWFRZGpiYjFmalVDSHdaNkRuSFFtTW1ENnN3Y1RDbnhXcHlRRDlVV1hUNnZIRmZjWnRkQjNiNHVmWEFwUG9IClNyaXp6UGZYQmMvNjJMOEtGd2d2WFVHU0FRNjZtMEFkUVRFY2d4VEFSMXRMZTlCZGwzNUdDNGlXS2ZVT2p6Q1MKNjFDTStxTUVIdS9iMmtiUm5RdEc5a2xpSFF4TXBYZWNXQnNRbkczV1J5aHc1ZXAxdEpyU0NmS2FjWUNGQTBMKwplWFN3VXQwOUV0ampieWhVMGx6T2Q2ckhtZUE5ZXAzVjZpL2NvcklUVlo0eG9YemdqNEdSVzVjdzltUWw5L0NmCnFPdVlNZDZITlk2eDNWMnQ4WngxL1RHVTZiYkxyRnJZL01OOAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==\n server: https://cae75c17-a58f-40e5-9824-9c3e5df4be57.api.k8s.fr-par.scw.cloud:6443\n name: cli-test-get-kubeconfig\ncontexts:\n- context:\n cluster: cli-test-get-kubeconfig\n user: cli-test-get-kubeconfig-admin\n name: admin@cli-test-get-kubeconfig\ncurrent-context: admin@cli-test-get-kubeconfig\nkind: Config\npreferences: {}\nusers:\n- name: cli-test-get-kubeconfig-admin\n user:\n token: YNBxaet5gE6Dpj1bcckNgcBHDPQMKe4JMy4cfLjFpH33NLHaNV0doMaq\n"

0 commit comments

Comments
 (0)