Skip to content
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

Jump to bottom

KubernetesDeserializer class resolving with SPI #4511

Merged
merged 8 commits into from
Nov 21, 2022
Merged

KubernetesDeserializer class resolving with SPI #4511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
65ed6b4
updating to the new trigger modules
shawkins Oct 19, 2022
a1fa96a
fix #3923: removing the need for mappingproviders
shawkins Apr 27, 2022
702ca7b
fix #3923: fully regenerating the models
shawkins Oct 19, 2022
470d852
fix #3923: cleaning up leftovers and adding osgi handling
shawkins Oct 19, 2022
4eda49b
fix #3923: removing kind only from registered classes
shawkins Nov 14, 2022
380e9d8
fix #4515: removing the legacy usage of model.properties
shawkins Nov 16, 2022
5a343cb
fix #4515: regenerating the models
shawkins Nov 16, 2022
61c9a98
fix #3923: adding a changelog KubernetesResourceMappingProvider removal
shawkins Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
* Fix #4136: added support for fieldValidation as a dsl method for POST/PUT/PATCH operations

#### _**Note**_: Breaking changes in the API
* Fix #4515: files located at the root of jars named model.properties, e.g. core.properties, have been removed
* Fix #3923: removed KubernetesResourceMappingProvider - a META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource list of resources is used instead.

### 6.2.0 (2022-10-20)

Expand Down
4 changes: 0 additions & 4 deletions extensions/camel-k/model-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@
<osgi.export>
io.fabric8.camelk.*
</osgi.export>
<osgi.include.resources>
${osgi.include.resources.default},
/camel-k-v1.properties=target/classes/model.properties
</osgi.include.resources>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions extensions/camel-k/model-v1/src/generated/java/io/fabric8/camelk/v1/Build.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@Version("v1")
@Group("camel.apache.org")
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "model.properties", gather = true)
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1")
@Group("camel.apache.org")
public class Build implements HasMetadata, Namespaced
{

Expand Down
5 changes: 5 additions & 0 deletions extensions/camel-k/model-v1/src/generated/java/io/fabric8/camelk/v1/BuildList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import io.fabric8.kubernetes.model.annotation.Version;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import io.sundr.transform.annotations.TemplateTransformation;
import io.sundr.transform.annotations.TemplateTransformations;
import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString;
Expand Down Expand Up @@ -67,6 +69,9 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1")
@Group("camel.apache.org")
public class BuildList implements KubernetesResource, KubernetesResourceList<io.fabric8.camelk.v1.Build>
Expand Down
6 changes: 3 additions & 3 deletions extensions/camel-k/model-v1/src/generated/java/io/fabric8/camelk/v1/CamelCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@Version("v1")
@Group("camel.apache.org")
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "model.properties", gather = true)
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1")
@Group("camel.apache.org")
public class CamelCatalog implements HasMetadata, Namespaced
{

Expand Down
5 changes: 5 additions & 0 deletions extensions/camel-k/model-v1/src/generated/java/io/fabric8/camelk/v1/CamelCatalogList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import io.fabric8.kubernetes.model.annotation.Version;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import io.sundr.transform.annotations.TemplateTransformation;
import io.sundr.transform.annotations.TemplateTransformations;
import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString;
Expand Down Expand Up @@ -67,6 +69,9 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1")
@Group("camel.apache.org")
public class CamelCatalogList implements KubernetesResource, KubernetesResourceList<io.fabric8.camelk.v1.CamelCatalog>
Expand Down
6 changes: 3 additions & 3 deletions extensions/camel-k/model-v1/src/generated/java/io/fabric8/camelk/v1/Integration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@Version("v1")
@Group("camel.apache.org")
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "model.properties", gather = true)
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1")
@Group("camel.apache.org")
public class Integration implements HasMetadata, Namespaced
{

Expand Down
6 changes: 3 additions & 3 deletions extensions/camel-k/model-v1/src/generated/java/io/fabric8/camelk/v1/IntegrationKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@Version("v1")
@Group("camel.apache.org")
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "model.properties", gather = true)
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1")
@Group("camel.apache.org")
public class IntegrationKit implements HasMetadata, Namespaced
{

Expand Down
5 changes: 5 additions & 0 deletions extensions/camel-k/model-v1/src/generated/java/io/fabric8/camelk/v1/IntegrationKitList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import io.fabric8.kubernetes.model.annotation.Version;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import io.sundr.transform.annotations.TemplateTransformation;
import io.sundr.transform.annotations.TemplateTransformations;
import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString;
Expand Down Expand Up @@ -67,6 +69,9 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1")
@Group("camel.apache.org")
public class IntegrationKitList implements KubernetesResource, KubernetesResourceList<io.fabric8.camelk.v1.IntegrationKit>
Expand Down
5 changes: 5 additions & 0 deletions extensions/camel-k/model-v1/src/generated/java/io/fabric8/camelk/v1/IntegrationList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import io.fabric8.kubernetes.model.annotation.Version;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import io.sundr.transform.annotations.TemplateTransformation;
import io.sundr.transform.annotations.TemplateTransformations;
import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString;
Expand Down Expand Up @@ -67,6 +69,9 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1")
@Group("camel.apache.org")
public class IntegrationList implements KubernetesResource, KubernetesResourceList<io.fabric8.camelk.v1.Integration>
Expand Down
6 changes: 3 additions & 3 deletions extensions/camel-k/model-v1/src/generated/java/io/fabric8/camelk/v1/IntegrationPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@Version("v1")
@Group("camel.apache.org")
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "model.properties", gather = true)
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1")
@Group("camel.apache.org")
public class IntegrationPlatform implements HasMetadata, Namespaced
{

Expand Down
5 changes: 5 additions & 0 deletions ...ons/camel-k/model-v1/src/generated/java/io/fabric8/camelk/v1/IntegrationPlatformList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import io.fabric8.kubernetes.model.annotation.Version;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import io.sundr.transform.annotations.TemplateTransformation;
import io.sundr.transform.annotations.TemplateTransformations;
import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString;
Expand Down Expand Up @@ -67,6 +69,9 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1")
@Group("camel.apache.org")
public class IntegrationPlatformList implements KubernetesResource, KubernetesResourceList<io.fabric8.camelk.v1.IntegrationPlatform>
Expand Down
39 changes: 0 additions & 39 deletions ...ons/camel-k/model-v1/src/main/java/io/fabric8/camelk/CamelKV1ResourceMappingProvider.java
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...n/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions extensions/camel-k/model-v1alpha1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@
<osgi.export>
io.fabric8.camelk.*
</osgi.export>
<osgi.include.resources>
${osgi.include.resources.default},
/camel-k-v1alpha1.properties=target/classes/model.properties
</osgi.include.resources>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions extensions/camel-k/model-v1alpha1/src/generated/java/io/fabric8/camelk/v1alpha1/Kamelet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@Version("v1alpha1")
@Group("camel.apache.org")
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "model.properties", gather = true)
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1alpha1")
@Group("camel.apache.org")
public class Kamelet implements HasMetadata, Namespaced
{

Expand Down
6 changes: 3 additions & 3 deletions .../camel-k/model-v1alpha1/src/generated/java/io/fabric8/camelk/v1alpha1/KameletBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@Version("v1alpha1")
@Group("camel.apache.org")
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "model.properties", gather = true)
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1alpha1")
@Group("camel.apache.org")
public class KameletBinding implements HasMetadata, Namespaced
{

Expand Down
5 changes: 5 additions & 0 deletions ...el-k/model-v1alpha1/src/generated/java/io/fabric8/camelk/v1alpha1/KameletBindingList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import io.fabric8.kubernetes.model.annotation.Version;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import io.sundr.transform.annotations.TemplateTransformation;
import io.sundr.transform.annotations.TemplateTransformations;
import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString;
Expand Down Expand Up @@ -67,6 +69,9 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1alpha1")
@Group("camel.apache.org")
public class KameletBindingList implements KubernetesResource, KubernetesResourceList<io.fabric8.camelk.v1alpha1.KameletBinding>
Expand Down
5 changes: 5 additions & 0 deletions ...ons/camel-k/model-v1alpha1/src/generated/java/io/fabric8/camelk/v1alpha1/KameletList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import io.fabric8.kubernetes.model.annotation.Version;
import io.sundr.builder.annotations.Buildable;
import io.sundr.builder.annotations.BuildableReference;
import io.sundr.transform.annotations.TemplateTransformation;
import io.sundr.transform.annotations.TemplateTransformations;
import lombok.EqualsAndHashCode;
import lombok.Setter;
import lombok.ToString;
Expand Down Expand Up @@ -67,6 +69,9 @@
@BuildableReference(Volume.class),
@BuildableReference(VolumeMount.class)
})
@TemplateTransformations({
@TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true)
})
@Version("v1alpha1")
@Group("camel.apache.org")
public class KameletList implements KubernetesResource, KubernetesResourceList<io.fabric8.camelk.v1alpha1.Kamelet>
Expand Down
35 changes: 0 additions & 35 deletions ...model-v1alpha1/src/main/java/io/fabric8/camelk/CamelKV1alpha1ResourceMappingProvider.java
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...n/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions extensions/certmanager/model-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@
<osgi.export>
io.fabric8.certmanager.api.model.*
</osgi.export>
<osgi.include.resources>
${osgi.include.resources.default},
/model-v1.properties=target/classes/model.properties
</osgi.include.resources>

<clone-kube>true</clone-kube>
</properties>

Expand Down