crossplane
/
function-sdk-java
mirror of https://github.com/crossplane/function-sdk-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include namePrefix in CRD name of CompositionResourceDefinition as CRD name must match plural.group (#20) 

Signed-off-by: Jesper Nylend <jesper.nylend@gmail.com>
This commit is contained in:
Jesper Nylend 2024-09-03 12:49:25 +02:00 committed by Knut-Erik Johnsen
parent ed71e066b7
commit 0928d07aba
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,6 @@ public class CrossplaneCompositeResourceService {
public static <T extends CustomResource<?, Void>> CompositeResourceDefinition createCompositeResourceDefinition(T compositionDefinition) { //}, Class functionMixin) {
CompositeResourceDefinition compositeResourceDefinition = new CompositeResourceDefinition();
compositeResourceDefinition.setMetadata(CrossplaneMetadataBuilder.createMetadata(compositionDefinition.getCRDName()));
CompositeResourceDefinitionSpec spec = new CompositeResourceDefinitionSpec();
spec.setGroup(compositionDefinition.getGroup());
@ -99,10 +98,11 @@ public class CrossplaneCompositeResourceService {
Versions versions = new Versions();
versions.setName(compositionDefinition.getVersion());
// This is not 100%. isStorage vs referencable. Need to check the crossplan docs
// This is not 100%. isStorage vs referencable. Need to check the crossplane docs
versions.setReferenceable(compositionDefinition.isStorage());
versions.setServed(compositionDefinition.isServed());
compositeResourceDefinition.setMetadata(CrossplaneMetadataBuilder.createMetadata(namePrefix + compositionDefinition.getCRDName()));
Schema schema = new Schema();
schema.setOpenAPIV3Schema(getOpenAPIV3Schema(compositionDefinition.getClass(), CrossplaneCompositeResourceMixin.class));

6
pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.1</version>
<version>3.3.3</version>
</parent>
<groupId>io.crossplane.compositefunctions</groupId>
@ -25,8 +25,8 @@
<maven.compiler.source>17</maven.compiler.source>
<!-- Dependency versions -->
<spring-boot.version>3.3.1</spring-boot.version>
<kubernetes-client.version>6.13.0</kubernetes-client.version>
<spring-boot.version>3.3.3</spring-boot.version>
<kubernetes-client.version>6.13.3</kubernetes-client.version>
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
<protobuf.version>3.25.1</protobuf.version>
<grpc.version>1.63.0</grpc.version>