refactor: kubernetes-model-kustomize generated from OpenAPI schemas

Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Aug 29, 2024 · f8e3b59 · f8e3b59
1 parent 0543463
commit f8e3b59
Show file tree

Hide file tree

Showing 33 changed files with 517 additions and 569 deletions.
diff --git a/Makefile b/Makefile
@@ -55,6 +55,7 @@ generate-openapi-classes:
 	cd kubernetes-model-generator/kubernetes-model-scheduling && mvn -Pgenerate clean install
 	cd kubernetes-model-generator/kubernetes-model-storageclass && mvn -Pgenerate clean install
 	cd kubernetes-model-generator/kubernetes-model-resource && mvn -Pgenerate clean install
+	cd kubernetes-model-generator/kubernetes-model-kustomize && mvn -Pgenerate clean install
 
 # Legacy generation of the model: TODO: remove
 .PHONY: generate-model-legacy

diff --git a/kubernetes-model-generator/generateModel.sh b/kubernetes-model-generator/generateModel.sh
@@ -22,7 +22,6 @@ ABSOLUTE_BASEDIR=$(realpath "$BASEDIR")
 
 # Array for all existing modules
 declare -a modules=(
-    "kubernetes-model-kustomize"
     "openshift-model-config"
     "openshift-model"
     "openshift-model-operator"

diff --git a/kubernetes-model-generator/kubernetes-model-kustomize/Makefile b/kubernetes-model-generator/kubernetes-model-kustomize/Makefile
diff --git a/kubernetes-model-generator/kubernetes-model-kustomize/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-kustomize/cmd/generate/generate.go
diff --git a/kubernetes-model-generator/kubernetes-model-kustomize/pom.xml b/kubernetes-model-generator/kubernetes-model-kustomize/pom.xml
@@ -43,45 +43,33 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-model-common</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <configuration>
-              <skipAttach>false</skipAttach>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <profiles>
     <profile>
       <id>generate</id>
       <build>
         <plugins>
           <plugin>
-            <groupId>org.jsonschema2pojo</groupId>
-            <artifactId>jsonschema2pojo-maven-plugin</artifactId>
-            <configuration>
-              <customAnnotator>io.fabric8.kubernetes.jsonschema2pojo.KubernetesCoreTypeAnnotator</customAnnotator>
+            <groupId>io.fabric8</groupId>
+            <artifactId>openapi-model-generator-maven-plugin</artifactId>
+            <configuration >
+              <settings combine.self="append">
+                <schemas>
+                  <schema>${project.basedir}/../openapi/schemas/kustomize.json</schema>
+                </schemas>
+                <packageMappings combine.self="append">
+                  <io.k8s.sigs.kustomize.api.types>io.fabric8.kubernetes.api.model.kustomize.v1beta1</io.k8s.sigs.kustomize.api.types>
+                </packageMappings>
+                <includeGenerationRegexes>
+                  <includeGenerationRegex>^io\.k8s\.sigs\.kustomize\.api\..*$</includeGenerationRegex>
+                </includeGenerationRegexes>
+              </settings>
             </configuration>
           </plugin>
         </plugins>

diff --git a/...rnetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/...rnetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java
diff --git a/...-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/...-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java
diff --git a/...e/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/ConfigMapArgs.java b/...e/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/ConfigMapArgs.java
@@ -14,8 +14,18 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
 import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
@@ -38,7 +48,17 @@
     "_",
     ""
 })
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder")
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
 @Generated("jsonschema2pojo")
 public class ConfigMapArgs implements Editable<ConfigMapArgsBuilder> , KubernetesResource
 {

diff --git a/...ze/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/FieldOptions.java b/...ze/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/FieldOptions.java
@@ -12,8 +12,18 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import io.fabric8.kubernetes.api.model.LocalObjectReference;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import io.fabric8.kubernetes.api.model.PodTemplateSpec;
+import io.fabric8.kubernetes.api.model.ResourceRequirements;
 import io.sundr.builder.annotations.Buildable;
+import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
@@ -32,7 +42,17 @@
     "_",
     ""
 })
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder")
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
+    @BuildableReference(ObjectMeta.class),
+    @BuildableReference(LabelSelector.class),
+    @BuildableReference(Container.class),
+    @BuildableReference(PodTemplateSpec.class),
+    @BuildableReference(ResourceRequirements.class),
+    @BuildableReference(IntOrString.class),
+    @BuildableReference(ObjectReference.class),
+    @BuildableReference(LocalObjectReference.class),
+    @BuildableReference(PersistentVolumeClaim.class)
+})
 @Generated("jsonschema2pojo")
 public class FieldOptions implements Editable<FieldOptionsBuilder> , KubernetesResource
 {