refactor: kubernetes-model-extensions generated from OpenAPI schemas

Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Aug 6, 2024 · 9a9f96d · 9a9f96d
1 parent f3ec2cd
commit 9a9f96d
Show file tree

Hide file tree

Showing 45 changed files with 2,463 additions and 1,298 deletions.
diff --git a/Makefile b/Makefile
@@ -45,6 +45,7 @@ generate-openapi-classes:
 	cd kubernetes-model-generator/kubernetes-model-coordination && mvn -Pgenerate clean install
 	cd kubernetes-model-generator/kubernetes-model-discovery && mvn -Pgenerate clean install
 	cd kubernetes-model-generator/kubernetes-model-events && mvn -Pgenerate clean install
+	cd kubernetes-model-generator/kubernetes-model-extensions && mvn -Pgenerate clean install
 
 # Legacy generation of the model: TODO: remove
 .PHONY: generate-model-legacy

diff --git a/...rnetes-client/src/test/java/io/fabric8/kubernetes/client/impl/URLFromIngressImplTest.java b/...rnetes-client/src/test/java/io/fabric8/kubernetes/client/impl/URLFromIngressImplTest.java
@@ -173,7 +173,6 @@ private io.fabric8.kubernetes.api.model.extensions.IngressBuilder createNewExten
         .withNewHttp()
         .addNewPath()
         .withPath("/testpath")
-        .withPathType("Prefix")
         .withNewBackend()
         .withServiceName("svc1")
         .withServicePort(new IntOrString(80))

diff --git a/...ent/src/test/java/io/fabric8/kubernetes/client/utils/internal/URLFromServiceUtilTest.java b/...ent/src/test/java/io/fabric8/kubernetes/client/utils/internal/URLFromServiceUtilTest.java
@@ -375,7 +375,6 @@ private io.fabric8.kubernetes.api.model.extensions.IngressBuilder createNewExten
         .withNewHttp()
         .addNewPath()
         .withPath("/testpath")
-        .withPathType("Prefix")
         .withNewBackend()
         .withServiceName("svc1")
         .withServicePort(new IntOrString("http"))

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-extensions"
     "kubernetes-model-flowcontrol"
     "kubernetes-model-gatewayapi"
     "kubernetes-model-networking"

diff --git a/kubernetes-model-generator/kubernetes-model-extensions/Makefile b/kubernetes-model-generator/kubernetes-model-extensions/Makefile
diff --git a/kubernetes-model-generator/kubernetes-model-extensions/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-extensions/cmd/generate/generate.go
diff --git a/kubernetes-model-generator/kubernetes-model-extensions/pom.xml b/kubernetes-model-generator/kubernetes-model-extensions/pom.xml
@@ -41,37 +41,29 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>kubernetes-model-common</artifactId>
-    </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>
+            <groupId>io.fabric8</groupId>
+            <artifactId>openapi-model-generator-maven-plugin</artifactId>
+            <configuration >
+              <settings combine.self="append">
+                <schemas>
+                  <schema>${project.basedir}/../openapi/schemas/kubernetes-1.17.17.json</schema>
+                </schemas>
+                <packageMappings combine.self="append">
+                  <io.k8s.api.extensions.v1beta1>io.fabric8.kubernetes.api.model.extensions</io.k8s.api.extensions.v1beta1>
+                </packageMappings>
+                <includeGenerationRegexes>
+                  <includeGenerationRegex>^io\.k8s\.api\.extensions\..*$</includeGenerationRegex>
+                </includeGenerationRegexes>
+              </settings>
+            </configuration>
           </plugin>
         </plugins>
       </build>