Skip to content

Commit 9da1806

Browse files
csviricsviri
committed
feat: namespace deletion issue
1 parent 339520a commit 9da1806

File tree

5 files changed

+189
-0
lines changed

5 files changed

+189
-0
lines changed

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/NamespaceDeletionIT.java

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
package io.javaoperatorsdk.operator;
2+
3+
import java.time.Duration;
4+
5+
import org.junit.jupiter.api.AfterEach;
6+
import org.junit.jupiter.api.BeforeEach;
7+
import org.junit.jupiter.api.Test;
8+
import org.junit.jupiter.api.TestInfo;
9+
10+
import io.fabric8.kubernetes.api.model.Namespace;
11+
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
12+
import io.fabric8.kubernetes.api.model.rbac.Role;
13+
import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
14+
import io.fabric8.kubernetes.client.ConfigBuilder;
15+
import io.fabric8.kubernetes.client.KubernetesClient;
16+
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
17+
import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil;
18+
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
19+
import io.javaoperatorsdk.operator.sample.namespacedeletion.NamespaceDeletionTestCustomResource;
20+
import io.javaoperatorsdk.operator.sample.namespacedeletion.NamespaceDeletionTestReconciler;
21+
22+
import static org.assertj.core.api.Assertions.assertThat;
23+
import static org.awaitility.Awaitility.await;
24+
25+
public class NamespaceDeletionIT {
26+
27+
KubernetesClient adminClient = new KubernetesClientBuilder().build();
28+
29+
KubernetesClient client = new KubernetesClientBuilder()
30+
.withConfig(new ConfigBuilder()
31+
.withImpersonateUsername("namespace-deletion-test-user")
32+
.build())
33+
.build();
34+
35+
String actualNamespace;
36+
Operator operator;
37+
38+
@BeforeEach
39+
void beforeEach(TestInfo testInfo) {
40+
LocallyRunOperatorExtension.applyCrd(NamespaceDeletionTestCustomResource.class,
41+
adminClient);
42+
43+
testInfo.getTestMethod().ifPresent(method -> {
44+
actualNamespace = KubernetesResourceUtil.sanitizeName(method.getName());
45+
adminClient.resource(namespace()).create();
46+
});
47+
48+
applyRBACResources();
49+
operator = new Operator(client);
50+
operator.register(new NamespaceDeletionTestReconciler(),
51+
o -> o.settingNamespaces(actualNamespace));
52+
operator.start();
53+
}
54+
55+
@AfterEach
56+
void cleanup() {
57+
if (operator != null) {
58+
operator.stop(Duration.ofSeconds(1));
59+
}
60+
}
61+
62+
@Test
63+
void testDeletingNamespaceWithRolesForOperator() {
64+
var res = adminClient.resource(testResource()).create();
65+
66+
await().untilAsserted(() -> {
67+
var actual = adminClient.resource(res).get();
68+
assertThat(actual.getMetadata().getFinalizers()).isNotEmpty();
69+
});
70+
71+
adminClient.resource(namespace()).delete();
72+
73+
await().untilAsserted(() -> {
74+
var actual = adminClient.resource(res).get();
75+
assertThat(actual).isNull();
76+
});
77+
}
78+
79+
NamespaceDeletionTestCustomResource testResource() {
80+
NamespaceDeletionTestCustomResource resource = new NamespaceDeletionTestCustomResource();
81+
resource.setMetadata(new ObjectMetaBuilder()
82+
.withName("test1")
83+
.withNamespace(actualNamespace)
84+
.build());
85+
return resource;
86+
}
87+
88+
private Namespace namespace() {
89+
return namespace(actualNamespace);
90+
}
91+
92+
private Namespace namespace(String name) {
93+
Namespace n = new Namespace();
94+
n.setMetadata(new ObjectMetaBuilder()
95+
.withName(name)
96+
.withName(actualNamespace)
97+
.build());
98+
return n;
99+
}
100+
101+
private void applyRBACResources() {
102+
var role = ReconcilerUtils
103+
.loadYaml(Role.class, NamespaceDeletionTestReconciler.class, "role.yaml");
104+
role.getMetadata().setNamespace(actualNamespace);
105+
adminClient.resource(role).create();
106+
107+
var roleBinding = ReconcilerUtils
108+
.loadYaml(RoleBinding.class, NamespaceDeletionTestReconciler.class, "role-binding.yaml");
109+
roleBinding.getMetadata().setNamespace(actualNamespace);
110+
adminClient.resource(roleBinding).create();
111+
}
112+
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/namespacedeletion/NamespaceDeletionTestCustomResource.java

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package io.javaoperatorsdk.operator.sample.namespacedeletion;
2+
3+
import io.fabric8.kubernetes.api.model.Namespaced;
4+
import io.fabric8.kubernetes.client.CustomResource;
5+
import io.fabric8.kubernetes.model.annotation.Group;
6+
import io.fabric8.kubernetes.model.annotation.ShortNames;
7+
import io.fabric8.kubernetes.model.annotation.Version;
8+
9+
@Group("sample.javaoperatorsdk")
10+
@Version("v1")
11+
@ShortNames("ndt")
12+
public class NamespaceDeletionTestCustomResource
13+
extends CustomResource<Void, Void>
14+
implements Namespaced {
15+
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/namespacedeletion/NamespaceDeletionTestReconciler.java

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package io.javaoperatorsdk.operator.sample.namespacedeletion;
2+
3+
import java.util.concurrent.atomic.AtomicInteger;
4+
5+
import io.javaoperatorsdk.operator.api.reconciler.*;
6+
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
7+
8+
@ControllerConfiguration
9+
public class NamespaceDeletionTestReconciler
10+
implements Reconciler<NamespaceDeletionTestCustomResource>, TestExecutionInfoProvider,
11+
Cleaner<NamespaceDeletionTestCustomResource> {
12+
13+
public static final int CLEANER_WAIT_PERIOD = 300;
14+
private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
15+
16+
@Override
17+
public UpdateControl<NamespaceDeletionTestCustomResource> reconcile(
18+
NamespaceDeletionTestCustomResource resource,
19+
Context<NamespaceDeletionTestCustomResource> context) {
20+
numberOfExecutions.addAndGet(1);
21+
return UpdateControl.noUpdate();
22+
}
23+
24+
public int getNumberOfExecutions() {
25+
return numberOfExecutions.get();
26+
}
27+
28+
@Override
29+
public DeleteControl cleanup(NamespaceDeletionTestCustomResource resource,
30+
Context<NamespaceDeletionTestCustomResource> context) {
31+
try {
32+
Thread.sleep(CLEANER_WAIT_PERIOD);
33+
} catch (InterruptedException e) {
34+
throw new IllegalStateException(e);
35+
}
36+
return DeleteControl.defaultDelete();
37+
}
38+
}

‎operator-framework/src/test/resources/io/javaoperatorsdk/operator/sample/namespacedeletion/role-binding.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
# This cluster role binding allows anyone in the "manager" group to read secrets in any namespace.
3+
kind: RoleBinding
4+
metadata:
5+
name: namespace-deletion
6+
subjects:
7+
- kind: User
8+
name: namespace-deletion-test-user
9+
apiGroup: rbac.authorization.k8s.io
10+
roleRef:
11+
kind: Role
12+
name: namespace-deletion-test
13+
apiGroup: rbac.authorization.k8s.io

‎operator-framework/src/test/resources/io/javaoperatorsdk/operator/sample/namespacedeletion/role.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: Role
3+
metadata:
4+
# "namespace" omitted since ClusterRoles are not namespaced
5+
name: namespace-deletion-test
6+
rules:
7+
- apiGroups: [ "sample.javaoperatorsdk" ]
8+
resources: [ "namespacedeletiontestcustomresources" ]
9+
verbs: [ "get", "watch", "list", "post", "update", "patch", "delete" ]
10+
11+

0 commit comments

Comments
 (0)