Skip to content

Commit 53fe2a7

Browse files
CopilotbrendandburnsCopilot
authored
Implement KubectlDelete to delete Kubernetes resources (#1696)
* Initial plan * Implement KubectlDelete functionality Co-authored-by: brendandburns <[email protected]> * Address code review feedback: Remove Thread.Sleep from test Co-authored-by: brendandburns <[email protected]> * Update tests/Kubectl.Tests/KubectlTests.Delete.cs Co-authored-by: Copilot <[email protected]> * Update tests/Kubectl.Tests/KubectlTests.Delete.cs Co-authored-by: Copilot <[email protected]> * Update tests/Kubectl.Tests/KubectlTests.Delete.cs Co-authored-by: Copilot <[email protected]> * Update tests/Kubectl.Tests/KubectlTests.Delete.cs Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: brendandburns <[email protected]> Co-authored-by: Copilot <[email protected]>
1 parent 2835914 commit 53fe2a7

File tree

3 files changed

+308
-0
lines changed

3 files changed

+308
-0
lines changed

‎src/KubernetesClient.Kubectl/Beta/AsyncKubectl.Delete.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
namespace k8s.kubectl.beta;
2+
3+
public partial class AsyncKubectl
4+
{
5+
/// <summary>
6+
/// Delete a Kubernetes resource by name.
7+
/// </summary>
8+
/// <typeparam name="T">The type of Kubernetes resource to delete.</typeparam>
9+
/// <param name="name">The name of the resource.</param>
10+
/// <param name="namespace">The namespace of the resource (for namespaced resources). Optional.</param>
11+
/// <param name="cancellationToken">Cancellation token.</param>
12+
/// <returns>The deleted resource.</returns>
13+
public async Task<T> DeleteAsync<T>(string name, string? @namespace = null, CancellationToken cancellationToken = default)
14+
where T : IKubernetesObject
15+
{
16+
var metadata = typeof(T).GetKubernetesTypeMetadata();
17+
using var genericClient = new GenericClient(client, metadata.Group, metadata.ApiVersion, metadata.PluralName, disposeClient: false);
18+
19+
return @namespace != null
20+
? await genericClient.DeleteNamespacedAsync<T>(@namespace, name, cancellationToken).ConfigureAwait(false)
21+
: await genericClient.DeleteAsync<T>(name, cancellationToken).ConfigureAwait(false);
22+
}
23+
}

‎src/KubernetesClient.Kubectl/Beta/Kubectl.Delete.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
namespace k8s.kubectl.beta;
2+
3+
public partial class Kubectl
4+
{
5+
/// <summary>
6+
/// Delete a Kubernetes resource by name.
7+
/// </summary>
8+
/// <typeparam name="T">The type of Kubernetes resource to delete.</typeparam>
9+
/// <param name="name">The name of the resource.</param>
10+
/// <param name="namespace">The namespace of the resource (for namespaced resources). Optional.</param>
11+
/// <returns>The deleted resource.</returns>
12+
public T Delete<T>(string name, string? @namespace = null)
13+
where T : IKubernetesObject
14+
{
15+
return client.DeleteAsync<T>(name, @namespace).GetAwaiter().GetResult();
16+
}
17+
}

‎tests/Kubectl.Tests/KubectlTests.Delete.cs‎

Lines changed: 268 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,268 @@
1+
using k8s.Autorest;
2+
using k8s.E2E;
3+
using k8s.kubectl.beta;
4+
using k8s.Models;
5+
using Xunit;
6+
7+
namespace k8s.kubectl.Tests;
8+
9+
public partial class KubectlTests
10+
{
11+
[MinikubeFact]
12+
public void DeletePod()
13+
{
14+
using var kubernetes = MinikubeTests.CreateClient();
15+
var client = new Kubectl(kubernetes);
16+
var namespaceParameter = "default";
17+
var podName = "k8scsharp-e2e-delete-pod";
18+
19+
// Create a test pod
20+
var pod = new V1Pod
21+
{
22+
Metadata = new V1ObjectMeta
23+
{
24+
Name = podName,
25+
NamespaceProperty = namespaceParameter,
26+
},
27+
Spec = new V1PodSpec
28+
{
29+
Containers = new[]
30+
{
31+
new V1Container
32+
{
33+
Name = "test",
34+
Image = "nginx:latest",
35+
},
36+
},
37+
},
38+
};
39+
40+
kubernetes.CoreV1.CreateNamespacedPod(pod, namespaceParameter);
41+
42+
try
43+
{
44+
// Delete the pod using kubectl
45+
var deletedPod = client.Delete<V1Pod>(podName, namespaceParameter);
46+
47+
Assert.NotNull(deletedPod);
48+
Assert.Equal(podName, deletedPod.Metadata.Name);
49+
Assert.Equal(namespaceParameter, deletedPod.Metadata.NamespaceProperty);
50+
51+
// Verify the pod is deleted by checking it doesn't exist
52+
Assert.Throws<HttpOperationException>(() =>
53+
{
54+
kubernetes.CoreV1.ReadNamespacedPod(podName, namespaceParameter);
55+
});
56+
}
57+
finally
58+
{
59+
try
60+
{
61+
kubernetes.CoreV1.DeleteNamespacedPod(podName, namespaceParameter);
62+
}
63+
catch (HttpOperationException)
64+
{
65+
// Ignore if the pod is already deleted
66+
}
67+
}
68+
}
69+
70+
[MinikubeFact]
71+
public void DeleteService()
72+
{
73+
using var kubernetes = MinikubeTests.CreateClient();
74+
var client = new Kubectl(kubernetes);
75+
var namespaceParameter = "default";
76+
var serviceName = "k8scsharp-e2e-delete-service";
77+
78+
// Create a test service
79+
var service = new V1Service
80+
{
81+
Metadata = new V1ObjectMeta
82+
{
83+
Name = serviceName,
84+
NamespaceProperty = namespaceParameter,
85+
},
86+
Spec = new V1ServiceSpec
87+
{
88+
Ports = new[]
89+
{
90+
new V1ServicePort
91+
{
92+
Port = 80,
93+
TargetPort = 80,
94+
},
95+
},
96+
Selector = new Dictionary<string, string>
97+
{
98+
{ "app", "test" },
99+
},
100+
},
101+
};
102+
103+
kubernetes.CoreV1.CreateNamespacedService(service, namespaceParameter);
104+
105+
// Delete the service using kubectl
106+
try
107+
{
108+
var deletedService = client.Delete<V1Service>(serviceName, namespaceParameter);
109+
110+
Assert.NotNull(deletedService);
111+
Assert.Equal(serviceName, deletedService.Metadata.Name);
112+
Assert.Equal(namespaceParameter, deletedService.Metadata.NamespaceProperty);
113+
114+
// Verify the service is deleted
115+
Assert.Throws<HttpOperationException>(() =>
116+
{
117+
kubernetes.CoreV1.ReadNamespacedService(serviceName, namespaceParameter);
118+
});
119+
}
120+
finally
121+
{
122+
try
123+
{
124+
client.Delete<V1Service>(serviceName, namespaceParameter);
125+
}
126+
catch (HttpOperationException)
127+
{
128+
// Ignore if already deleted
129+
}
130+
}
131+
}
132+
133+
[MinikubeFact]
134+
public void DeleteDeployment()
135+
{
136+
using var kubernetes = MinikubeTests.CreateClient();
137+
var client = new Kubectl(kubernetes);
138+
var namespaceParameter = "default";
139+
var deploymentName = "k8scsharp-e2e-delete-deployment";
140+
141+
// Create a test deployment
142+
var deployment = new V1Deployment
143+
{
144+
Metadata = new V1ObjectMeta
145+
{
146+
Name = deploymentName,
147+
NamespaceProperty = namespaceParameter,
148+
},
149+
Spec = new V1DeploymentSpec
150+
{
151+
Replicas = 1,
152+
Selector = new V1LabelSelector
153+
{
154+
MatchLabels = new Dictionary<string, string>
155+
{
156+
{ "app", "test" },
157+
},
158+
},
159+
Template = new V1PodTemplateSpec
160+
{
161+
Metadata = new V1ObjectMeta
162+
{
163+
Labels = new Dictionary<string, string>
164+
{
165+
{ "app", "test" },
166+
},
167+
},
168+
Spec = new V1PodSpec
169+
{
170+
Containers = new[]
171+
{
172+
new V1Container
173+
{
174+
Name = "test",
175+
Image = "nginx:latest",
176+
},
177+
},
178+
},
179+
},
180+
},
181+
};
182+
183+
kubernetes.AppsV1.CreateNamespacedDeployment(deployment, namespaceParameter);
184+
185+
// Delete the deployment using kubectl
186+
try
187+
{
188+
var deletedDeployment = client.Delete<V1Deployment>(deploymentName, namespaceParameter);
189+
190+
Assert.NotNull(deletedDeployment);
191+
Assert.Equal(deploymentName, deletedDeployment.Metadata.Name);
192+
Assert.Equal(namespaceParameter, deletedDeployment.Metadata.NamespaceProperty);
193+
194+
// Verify the deployment is deleted
195+
Assert.Throws<HttpOperationException>(() =>
196+
{
197+
kubernetes.AppsV1.ReadNamespacedDeployment(deploymentName, namespaceParameter);
198+
});
199+
}
200+
finally
201+
{
202+
try
203+
{
204+
kubernetes.AppsV1.DeleteNamespacedDeployment(deploymentName, namespaceParameter);
205+
}
206+
catch (HttpOperationException)
207+
{
208+
// Ignore if already deleted
209+
}
210+
}
211+
}
212+
213+
[MinikubeFact]
214+
public void DeleteNamespace()
215+
{
216+
using var kubernetes = MinikubeTests.CreateClient();
217+
var client = new Kubectl(kubernetes);
218+
var namespaceName = "k8scsharp-e2e-delete-ns";
219+
220+
try
221+
{
222+
// Create a test namespace
223+
var ns = new V1Namespace
224+
{
225+
Metadata = new V1ObjectMeta
226+
{
227+
Name = namespaceName,
228+
},
229+
};
230+
231+
kubernetes.CoreV1.CreateNamespace(ns);
232+
233+
// Delete the namespace using kubectl (cluster-scoped resource, no namespace parameter)
234+
var deletedNs = client.Delete<V1Namespace>(namespaceName);
235+
236+
Assert.NotNull(deletedNs);
237+
Assert.Equal(namespaceName, deletedNs.Metadata.Name);
238+
239+
// Verify the namespace is being deleted or already deleted
240+
// Note: Namespace deletion is async, so it might still exist in Terminating state
241+
try
242+
{
243+
var readNs = kubernetes.CoreV1.ReadNamespace(namespaceName);
244+
// If we can still read it, it should be in Terminating status
245+
Assert.Equal("Terminating", readNs.Status?.Phase);
246+
}
247+
catch (HttpOperationException)
248+
{
249+
// If we can't read it, that's also fine - it's been deleted
250+
}
251+
}
252+
finally
253+
{
254+
try
255+
{
256+
var ns = kubernetes.CoreV1.ReadNamespace(namespaceName);
257+
if (ns != null && ns.Status?.Phase != "Terminating")
258+
{
259+
kubernetes.CoreV1.DeleteNamespace(namespaceName, new V1DeleteOptions());
260+
}
261+
}
262+
catch (HttpOperationException)
263+
{
264+
// Ignore - already deleted or not found
265+
}
266+
}
267+
}
268+
}

0 commit comments

Comments
 (0)