Skip to content

Commit 5617cf9

Browse files
committed
fix: use proper client version to apply CRDs
1 parent 7fb1666 commit 5617cf9

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,17 @@ public void initialize(
7070
log.info("Operator is running with {}", controller.getClass().getCanonicalName());
7171
}
7272

73-
public CustomResourceDefinition loadCRDAndApplyToCluster(String classPathYaml) {
74-
CustomResourceDefinition crd = loadYaml(CustomResourceDefinition.class, classPathYaml);
75-
k8sClient.apiextensions().v1().customResourceDefinitions().createOrReplace(crd);
76-
return crd;
73+
public void loadCRDAndApplyToCluster(String classPathYaml) {
74+
var crd = loadYaml(CustomResourceDefinition.class, classPathYaml);
75+
if ("apiextensions.k8s.io/v1".equals(crd.getApiVersion())) {
76+
k8sClient.apiextensions().v1().customResourceDefinitions().createOrReplace(crd);
77+
} else {
78+
var crd2 =
79+
loadYaml(
80+
io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition.class,
81+
classPathYaml);
82+
k8sClient.apiextensions().v1beta1().customResourceDefinitions().createOrReplace(crd2);
83+
}
7784
}
7885

7986
public void cleanup() {

0 commit comments

Comments
 (0)