refactor: sh.volcano generated from OpenAPI schemas

Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Oct 8, 2024 · 75cd9c2 · 75cd9c2
1 parent d00b10d
commit 75cd9c2
Show file tree

Hide file tree

Showing 89 changed files with 8,818 additions and 1,691 deletions.
diff --git a/Makefile b/Makefile
@@ -45,6 +45,8 @@ openapi-generate-java-classes:
 	cd extensions && mvn $(MAVEN_ARGS) -N clean install
 	cd extensions/volumesnapshot && mvn $(MAVEN_ARGS) -N clean install
 	cd extensions/volumesnapshot/model && mvn $(MAVEN_ARGS) -Pgenerate clean install
+	cd extensions/volcano && mvn $(MAVEN_ARGS) -N clean install
+	cd extensions/volcano/model && mvn $(MAVEN_ARGS) -Pgenerate clean install
 
 # Legacy generation of the model: TODO: remove
 .PHONY: generate-model-legacy

diff --git a/extensions/volcano/client/pom.xml b/extensions/volcano/client/pom.xml
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
-      <artifactId>volcano-model-v1beta1</artifactId>
+      <artifactId>volcano-model</artifactId>
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>

diff --git a/extensions/volcano/client/src/main/java/io/fabric8/volcano/client/DefaultVolcanoClient.java b/extensions/volcano/client/src/main/java/io/fabric8/volcano/client/DefaultVolcanoClient.java
@@ -24,11 +24,11 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.extension.ExtensionRootClientAdapter;
 import io.fabric8.kubernetes.client.extension.SupportTestingClient;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroup;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroupList;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.Queue;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.QueueList;
 import io.fabric8.volcano.client.dsl.V1beta1APIGroupDSL;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroup;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroupList;
-import io.fabric8.volcano.scheduling.v1beta1.Queue;
-import io.fabric8.volcano.scheduling.v1beta1.QueueList;
 
 public class DefaultVolcanoClient extends ExtensionRootClientAdapter<DefaultVolcanoClient>
     implements NamespacedVolcanoClient, SupportTestingClient {

diff --git a/extensions/volcano/client/src/main/java/io/fabric8/volcano/client/V1beta1APIGroupClient.java b/extensions/volcano/client/src/main/java/io/fabric8/volcano/client/V1beta1APIGroupClient.java
@@ -18,11 +18,11 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.extension.ClientAdapter;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroup;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroupList;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.Queue;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.QueueList;
 import io.fabric8.volcano.client.dsl.V1beta1APIGroupDSL;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroup;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroupList;
-import io.fabric8.volcano.scheduling.v1beta1.Queue;
-import io.fabric8.volcano.scheduling.v1beta1.QueueList;
 
 public class V1beta1APIGroupClient extends ClientAdapter<V1beta1APIGroupClient> implements V1beta1APIGroupDSL {
 

diff --git a/extensions/volcano/client/src/main/java/io/fabric8/volcano/client/VolcanoClient.java b/extensions/volcano/client/src/main/java/io/fabric8/volcano/client/VolcanoClient.java
@@ -18,11 +18,11 @@
 import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroup;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroupList;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.Queue;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.QueueList;
 import io.fabric8.volcano.client.dsl.V1beta1APIGroupDSL;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroup;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroupList;
-import io.fabric8.volcano.scheduling.v1beta1.Queue;
-import io.fabric8.volcano.scheduling.v1beta1.QueueList;
 
 /**
  * Main interface for Volcano client library.

diff --git a/...nsions/volcano/client/src/main/java/io/fabric8/volcano/client/dsl/V1beta1APIGroupDSL.java b/...nsions/volcano/client/src/main/java/io/fabric8/volcano/client/dsl/V1beta1APIGroupDSL.java
@@ -18,10 +18,10 @@
 import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroup;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroupList;
-import io.fabric8.volcano.scheduling.v1beta1.Queue;
-import io.fabric8.volcano.scheduling.v1beta1.QueueList;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroup;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroupList;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.Queue;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.QueueList;
 
 public interface V1beta1APIGroupDSL extends Client {
   MixedOperation<PodGroup, PodGroupList, Resource<PodGroup>> podGroups();

diff --git a/extensions/volcano/examples/src/main/java/io/fabric8/volcano/examples/PodGroupCreate.java b/extensions/volcano/examples/src/main/java/io/fabric8/volcano/examples/PodGroupCreate.java
@@ -15,10 +15,10 @@
  */
 package io.fabric8.volcano.examples;
 
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroup;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroupList;
 import io.fabric8.volcano.client.DefaultVolcanoClient;
 import io.fabric8.volcano.client.NamespacedVolcanoClient;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroup;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroupList;
 
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

diff --git a/extensions/volcano/examples/src/main/java/io/fabric8/volcano/examples/QueueCreate.java b/extensions/volcano/examples/src/main/java/io/fabric8/volcano/examples/QueueCreate.java
@@ -15,10 +15,10 @@
  */
 package io.fabric8.volcano.examples;
 
+import io.fabric8.volcano.api.model.scheduling.v1beta1.Queue;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.QueueList;
 import io.fabric8.volcano.client.DefaultVolcanoClient;
 import io.fabric8.volcano.client.NamespacedVolcanoClient;
-import io.fabric8.volcano.scheduling.v1beta1.Queue;
-import io.fabric8.volcano.scheduling.v1beta1.QueueList;
 
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

diff --git a/extensions/volcano/examples/src/main/java/io/fabric8/volcano/examples/Utils.java b/extensions/volcano/examples/src/main/java/io/fabric8/volcano/examples/Utils.java
@@ -17,10 +17,10 @@
 
 import io.fabric8.kubernetes.api.model.Quantity;
 import io.fabric8.kubernetes.api.model.QuantityBuilder;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroup;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroupBuilder;
-import io.fabric8.volcano.scheduling.v1beta1.Queue;
-import io.fabric8.volcano.scheduling.v1beta1.QueueBuilder;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroup;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroupBuilder;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.Queue;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.QueueBuilder;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...ns/volcano/examples/src/main/java/io/fabric8/volcano/examples/v1beta1/PodGroupCreate.java b/...ns/volcano/examples/src/main/java/io/fabric8/volcano/examples/v1beta1/PodGroupCreate.java
@@ -15,11 +15,11 @@
  */
 package io.fabric8.volcano.examples.v1beta1;
 
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroup;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.PodGroupList;
 import io.fabric8.volcano.client.DefaultVolcanoClient;
 import io.fabric8.volcano.client.NamespacedVolcanoClient;
 import io.fabric8.volcano.examples.Utils;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroup;
-import io.fabric8.volcano.scheduling.v1beta1.PodGroupList;
 
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

diff --git a/...sions/volcano/examples/src/main/java/io/fabric8/volcano/examples/v1beta1/QueueCreate.java b/...sions/volcano/examples/src/main/java/io/fabric8/volcano/examples/v1beta1/QueueCreate.java
@@ -15,11 +15,11 @@
  */
 package io.fabric8.volcano.examples.v1beta1;
 
+import io.fabric8.volcano.api.model.scheduling.v1beta1.Queue;
+import io.fabric8.volcano.api.model.scheduling.v1beta1.QueueList;
 import io.fabric8.volcano.client.DefaultVolcanoClient;
 import io.fabric8.volcano.client.NamespacedVolcanoClient;
 import io.fabric8.volcano.examples.Utils;
-import io.fabric8.volcano.scheduling.v1beta1.Queue;
-import io.fabric8.volcano.scheduling.v1beta1.QueueList;
 
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;

diff --git a/extensions/volcano/generateModel.sh b/extensions/volcano/generateModel.sh
diff --git a/extensions/volcano/generator-v1beta1/.gitignore b/extensions/volcano/generator-v1beta1/.gitignore
diff --git a/extensions/volcano/generator-v1beta1/Makefile b/extensions/volcano/generator-v1beta1/Makefile
diff --git a/extensions/volcano/generator-v1beta1/cmd/generate/generate.go b/extensions/volcano/generator-v1beta1/cmd/generate/generate.go
diff --git a/extensions/volcano/generator-v1beta1/go.mod b/extensions/volcano/generator-v1beta1/go.mod