Skip to content

Commit 6d69800

Browse files
committed
fix(model-core) apiVersion for core k8s resources
The HasMetadata#getApiVersion method is returning a string starting with "/" when the group is "". This is not consistent with how owner references are specified. This issues is causing: operator-framework/java-operator-sdk#2723
1 parent 2024d02 commit 6d69800

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

Diff for: kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/HasMetadata.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ static String getApiVersion(Class<?> clazz) {
7676
final String group = getGroup(clazz);
7777
final String version = getVersion(clazz);
7878
if (group != null && version != null) {
79-
return group + "/" + version;
79+
if (group.isEmpty()) {
80+
return version;
81+
} else {
82+
return group + "/" + version;
83+
}
8084
}
8185
if (group != null || version != null) {
8286
throw new IllegalArgumentException(

Diff for: kubernetes-model-generator/kubernetes-model-core/src/test/java/io/fabric8/kubernetes/api/model/HasMetadataTest.java

+5
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@ void addingAndRemovingOwnerReferenceShouldWork() {
206206
assertFalse(hasMetadata.hasOwnerReferenceFor(owner2));
207207
}
208208

209+
@Test
210+
void apiVersionOfConfigMapShouldBeCorrect() {
211+
assertEquals("v1", HasMetadata.getApiVersion(ConfigMap.class));
212+
}
213+
209214
@Test
210215
void addingSameOwnerReferenceMultipleTimesShouldAddItOnlyOnce() {
211216
HasMetadata hasMetadata = new Default();

0 commit comments

Comments
 (0)