Skip to content

Commit e194e01

Browse files
csviricsviri
committed
CRD generator fix
1 parent 3590a8c commit e194e01

File tree

8 files changed

+55
-27
lines changed

8 files changed

+55
-27
lines changed

‎operator-framework-core/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,10 @@
5252

5353

5454
<dependencies>
55-
<!-- We use the OpenShift client, because functionally it is a superset of the Kubernetes client -->
5655
<dependency>
5756
<groupId>io.fabric8</groupId>
5857
<artifactId>kubernetes-client</artifactId>
5958
</dependency>
60-
6159
<dependency>
6260
<groupId>org.slf4j</groupId>
6361
<artifactId>slf4j-api</artifactId>

‎operator-framework/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@
6161
<artifactId>crd-generator-apt</artifactId>
6262
<scope>test</scope>
6363
</dependency>
64+
<dependency>
65+
<groupId>io.fabric8</groupId>
66+
<artifactId>crd-generator-api</artifactId>
67+
<scope>test</scope>
68+
</dependency>
6469
<dependency>
6570
<groupId>org.apache.logging.log4j</groupId>
6671
<artifactId>log4j-slf4j-impl</artifactId>

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java

+18-17
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,24 @@ public void setKubernetesClient(KubernetesClient kubernetesClient) {
6666
public DeleteControl cleanup(
6767
TestCustomResource resource, Context<TestCustomResource> context) {
6868
numberOfCleanupExecutions.incrementAndGet();
69-
Boolean delete =
70-
kubernetesClient
71-
.configMaps()
72-
.inNamespace(resource.getMetadata().getNamespace())
73-
.withName(resource.getSpec().getConfigMapName())
74-
.delete();
75-
if (delete) {
76-
log.info(
77-
"Deleted ConfigMap {} for resource: {}",
78-
resource.getSpec().getConfigMapName(),
79-
resource.getMetadata().getName());
80-
} else {
81-
log.error(
82-
"Failed to delete ConfigMap {} for resource: {}",
83-
resource.getSpec().getConfigMapName(),
84-
resource.getMetadata().getName());
85-
}
69+
70+
var statusDetail = kubernetesClient
71+
.configMaps()
72+
.inNamespace(resource.getMetadata().getNamespace())
73+
.withName(resource.getSpec().getConfigMapName())
74+
.delete();
75+
// todo
76+
// if (delete) {
77+
log.info(
78+
"Deleted ConfigMap {} for resource: {}",
79+
resource.getSpec().getConfigMapName(),
80+
resource.getMetadata().getName());
81+
// } else {
82+
// log.error(
83+
// "Failed to delete ConfigMap {} for resource: {}",
84+
// resource.getSpec().getConfigMapName(),
85+
// resource.getMetadata().getName());
86+
// }
8687
return DeleteControl.defaultDelete();
8788
}
8889

‎pom.xml

+16-7
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,13 @@
8585

8686
<dependencyManagement>
8787
<dependencies>
88+
<dependency>
89+
<groupId>org.junit</groupId>
90+
<artifactId>junit-bom</artifactId>
91+
<version>${junit.version}</version>
92+
<type>pom</type>
93+
<scope>import</scope>
94+
</dependency>
8895
<dependency>
8996
<groupId>io.fabric8</groupId>
9097
<artifactId>kubernetes-client-bom</artifactId>
@@ -93,13 +100,16 @@
93100
<scope>import</scope>
94101
</dependency>
95102
<dependency>
96-
<groupId>org.junit</groupId>
97-
<artifactId>junit-bom</artifactId>
98-
<version>${junit.version}</version>
99-
<type>pom</type>
100-
<scope>import</scope>
103+
<groupId>io.fabric8</groupId>
104+
<artifactId>kubernetes-server-mock</artifactId>
105+
<version>${fabric8-client.version}</version>
106+
<scope>test</scope>
107+
</dependency>
108+
<dependency>
109+
<groupId>io.fabric8</groupId>
110+
<artifactId>kubernetes-client</artifactId>
111+
<version>${fabric8-client.version}</version>
101112
</dependency>
102-
103113
<dependency>
104114
<groupId>org.apache.commons</groupId>
105115
<artifactId>commons-lang3</artifactId>
@@ -115,7 +125,6 @@
115125
<artifactId>micrometer-core</artifactId>
116126
<version>${micrometer-core.version}</version>
117127
</dependency>
118-
119128
<dependency>
120129
<groupId>com.squareup</groupId>
121130
<artifactId>javapoet</artifactId>

‎sample-operators/mysql-schema/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
<artifactId>crd-generator-apt</artifactId>
4848
<scope>provided</scope>
4949
</dependency>
50+
<dependency>
51+
<groupId>io.fabric8</groupId>
52+
<artifactId>crd-generator-api</artifactId>
53+
</dependency>
5054
<dependency>
5155
<groupId>org.apache.logging.log4j</groupId>
5256
<artifactId>log4j-slf4j-impl</artifactId>

‎sample-operators/tomcat-operator/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<artifactId>crd-generator-apt</artifactId>
3333
<scope>provided</scope>
3434
</dependency>
35+
<dependency>
36+
<groupId>io.fabric8</groupId>
37+
<artifactId>crd-generator-api</artifactId>
38+
</dependency>
3539
<dependency>
3640
<groupId>org.apache.logging.log4j</groupId>
3741
<artifactId>log4j-slf4j-impl</artifactId>

‎sample-operators/webpage/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
<artifactId>crd-generator-apt</artifactId>
4141
<scope>provided</scope>
4242
</dependency>
43+
<dependency>
44+
<groupId>io.fabric8</groupId>
45+
<artifactId>crd-generator-api</artifactId>
46+
</dependency>
4347
<dependency>
4448
<groupId>org.awaitility</groupId>
4549
<artifactId>awaitility</artifactId>

‎smoke-test-samples/common/pom.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
<artifactId>crd-generator-apt</artifactId>
2626
<scope>compile</scope>
2727
</dependency>
28-
28+
<dependency>
29+
<groupId>io.fabric8</groupId>
30+
<artifactId>crd-generator-api</artifactId>
31+
</dependency>
2932
<dependency>
3033
<groupId>org.apache.logging.log4j</groupId>
3134
<artifactId>log4j-slf4j-impl</artifactId>

0 commit comments

Comments
 (0)