Skip to content

Commit e7edfe6

Browse files
nylend95jespernylendklp
authored andcommitted
Include namePrefix in CRD name of CompositionResourceDefinition as CRD name must match plural.group
Signed-off-by: Jesper Nylend <jesper.nylend@klp.no>
1 parent 4a23c6b commit e7edfe6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

crossplane-function-springboot-starter/src/main/java/io/crossplane/compositefunctions/starter/registration/CrossplaneCompositeResourceService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ private static void registerOrUpdateCompositeResourceDefinition(CompositeResourc
7474
public static <T extends CustomResource<?, Void>> CompositeResourceDefinition createCompositeResourceDefinition(T compositionDefinition) { //}, Class functionMixin) {
7575

7676
CompositeResourceDefinition compositeResourceDefinition = new CompositeResourceDefinition();
77-
compositeResourceDefinition.setMetadata(CrossplaneMetadataBuilder.createMetadata(compositionDefinition.getCRDName()));
7877

7978
CompositeResourceDefinitionSpec spec = new CompositeResourceDefinitionSpec();
8079
spec.setGroup(compositionDefinition.getGroup());
@@ -99,10 +98,11 @@ public static <T extends CustomResource<?, Void>> CompositeResourceDefinition cr
9998
Versions versions = new Versions();
10099
versions.setName(compositionDefinition.getVersion());
101100

102-
// This is not 100%. isStorage vs referencable. Need to check the crossplan docs
101+
// This is not 100%. isStorage vs referencable. Need to check the crossplane docs
103102
versions.setReferenceable(compositionDefinition.isStorage());
104103
versions.setServed(compositionDefinition.isServed());
105104

105+
compositeResourceDefinition.setMetadata(CrossplaneMetadataBuilder.createMetadata(namePrefix + compositionDefinition.getCRDName()));
106106

107107
Schema schema = new Schema();
108108
schema.setOpenAPIV3Schema(getOpenAPIV3Schema(compositionDefinition.getClass(), CrossplaneCompositeResourceMixin.class));

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.3.1</version>
9+
<version>3.3.3</version>
1010
</parent>
1111

1212
<groupId>io.crossplane.compositefunctions</groupId>
@@ -25,8 +25,8 @@
2525
<maven.compiler.source>17</maven.compiler.source>
2626

2727
<!-- Dependency versions -->
28-
<spring-boot.version>3.3.1</spring-boot.version>
29-
<kubernetes-client.version>6.13.0</kubernetes-client.version>
28+
<spring-boot.version>3.3.3</spring-boot.version>
29+
<kubernetes-client.version>6.13.3</kubernetes-client.version>
3030
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
3131
<protobuf.version>3.25.1</protobuf.version>
3232
<grpc.version>1.63.0</grpc.version>

0 commit comments

Comments
 (0)