Skip to content

Include namePrefix in CRD name of CompositionResourceDefinition #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nylend95 wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

Include namePrefix in CRD name of CompositionResourceDefinition #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...rossplane/compositefunctions/starter/registration/CrossplaneCompositeResourceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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));
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down