From e7edfe650e4bb37468fc3c8e65a003facfb09e1b Mon Sep 17 00:00:00 2001
From: Jesper Nylend <jesper.nylend@gmail.com>
Date: Fri, 30 Aug 2024 14:10:42 +0200
Subject: [PATCH] Include namePrefix in CRD name of
 CompositionResourceDefinition as CRD name must match plural.group

Signed-off-by: Jesper Nylend <jesper.nylend@klp.no>
---
 .../registration/CrossplaneCompositeResourceService.java    | 4 ++--
 pom.xml                                                     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crossplane-function-springboot-starter/src/main/java/io/crossplane/compositefunctions/starter/registration/CrossplaneCompositeResourceService.java b/crossplane-function-springboot-starter/src/main/java/io/crossplane/compositefunctions/starter/registration/CrossplaneCompositeResourceService.java
index f5d1528..6220c08 100644
--- a/crossplane-function-springboot-starter/src/main/java/io/crossplane/compositefunctions/starter/registration/CrossplaneCompositeResourceService.java
+++ b/crossplane-function-springboot-starter/src/main/java/io/crossplane/compositefunctions/starter/registration/CrossplaneCompositeResourceService.java
@@ -74,7 +74,6 @@ private static void registerOrUpdateCompositeResourceDefinition(CompositeResourc
     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 static <T extends CustomResource<?, Void>> CompositeResourceDefinition cr
         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));
diff --git a/pom.xml b/pom.xml
index 047dc1a..af22ea1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>