Skip to content

Commit 3280f69

Browse files
authored
fix: same short name for multi version crd (#1920)
1 parent 5a8ae99 commit 3280f69

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Diff for: operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package io.javaoperatorsdk.operator.junit;
22

3+
import java.io.ByteArrayInputStream;
34
import java.io.InputStream;
5+
import java.nio.charset.StandardCharsets;
46
import java.time.Duration;
57
import java.util.ArrayList;
68
import java.util.HashMap;
@@ -176,7 +178,9 @@ public static void applyCrd(String resourceTypeName, KubernetesClient client) {
176178
if (is == null) {
177179
throw new IllegalStateException("Cannot find CRD at " + path);
178180
}
179-
final var crd = client.load(is);
181+
var crdString = new String(is.readAllBytes(), StandardCharsets.UTF_8);
182+
LOGGER.debug("Applying CRD: {}", crdString);
183+
final var crd = client.load(new ByteArrayInputStream(crdString.getBytes()));
180184
crd.createOrReplace();
181185
Thread.sleep(CRD_READY_WAIT); // readiness is not applicable for CRD, just wait a little
182186
LOGGER.debug("Applied CRD with path: {}", path);

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestCustomResource1.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@Group("sample.javaoperatorsdk")
1111
@Version("v1")
1212
@Kind("MultiVersionCRDTestCustomResource")
13-
@ShortNames("mv1")
13+
@ShortNames("mvc")
1414
public class MultiVersionCRDTestCustomResource1
1515
extends
1616
CustomResource<MultiVersionCRDTestCustomResourceSpec1, MultiVersionCRDTestCustomResourceStatus1>

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiversioncrd/MultiVersionCRDTestCustomResource2.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@Group("sample.javaoperatorsdk")
1111
@Version(value = "v2", storage = false)
1212
@Kind("MultiVersionCRDTestCustomResource")
13-
@ShortNames("mv2")
13+
@ShortNames("mvc")
1414
public class MultiVersionCRDTestCustomResource2
1515
extends
1616
CustomResource<MultiVersionCRDTestCustomResourceSpec2, MultiVersionCRDTestCustomResourceStatus2>

0 commit comments

Comments
 (0)