refactor: dev.tekton generated from OpenAPI schemas

Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Oct 14, 2024 · 358a33b · 358a33b
1 parent e6abb00
commit 358a33b
Show file tree

Hide file tree

Showing 354 changed files with 22,838 additions and 19,086 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/knative && mvn $(MAVEN_ARGS) -N clean install
 	cd extensions/knative/model && mvn $(MAVEN_ARGS) -Pgenerate clean install
+	cd extensions/tekton && mvn $(MAVEN_ARGS) -N clean install
+	cd extensions/tekton/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
 	cd extensions/volumesnapshot && mvn $(MAVEN_ARGS) -N clean install

diff --git a/doc/MIGRATION-v7.md b/doc/MIGRATION-v7.md
@@ -11,6 +11,7 @@
   - [Removed deprecated types for network.openshift.io (OpenShift-SDN-only)](#openshift-network-removed)
   - [Renamed clusterautoscaling to autoscaling](#openshift-clusterautoscaling-to-autoscaling)
   - [Renamed machineconfig to machineconfiguration](#openshift-machineconfig-to-machineconfiguration)
+  - [Tekton Extension](#tekton-extension)
 - [Deprecations and Removals](#deprecations-and-removals)
   - [Service Catalog API (extension) removed](#service-catalog-extension) 
 
@@ -103,6 +104,27 @@ The package has also been renamed from `io.fabric8.openshift.api.model.machineco
 
 The OpenShiftClient DSL entry-point remains the same: `OpenShiftClient.machineConfigurations()`.
 
+### Tekton Extension <a href="#tekton-extension" id="tekton-extension"/>
+
+All the model modules for the Tekton extension have been merged into a single module `io.fabric8:tekton-model`.
+
+The following packages have been moved:
+
+| Old Package                                                              | New Package                                  |
+|--------------------------------------------------------------------------|----------------------------------------------|
+| `io.fabric8.tekton.pipeline.v1`                                          | `io.fabric8.tekton.v1`                       |
+| `io.fabric8.tekton.pipeline.v1alpha1`                                    | `io.fabric8.tekton.v1alpha1`                 |
+| `io.fabric8.tekton.pipeline.v1beta1`                                     | `io.fabric8.tekton.v1beta1`                  |
+| `io.fabric8.tekton.v1.internal.pipeline.pkg.apis.config`                 | `io.fabric8.tekton.pipeline.pkg.apis.config` |
+| `io.fabric8.tekton.v1.internal.pipeline.pkg.apis.pipeline.pod`           | `io.fabric8.tekton.pod`                      |
+| `io.fabric8.tekton.v1alpha1.internal.pipeline.pkg.apis.pipeline.pod`     | `io.fabric8.tekton.pod`                      |
+| `io.fabric8.tekton.v1alpha1.internal.pipeline.pkg.apis.pipeline.v1beta1` | `io.fabric8.tekton.v1beta1`                  |
+| `io.fabric8.tekton.v1beta1.internal.pipeline.pkg.apis.config`            | `io.fabric8.tekton.pipeline.pkg.apis.config` |
+| `io.fabric8.tekton.v1beta1.internal.pipeline.pkg.apis.pipeline.pod`      | `io.fabric8.tekton.pod`                      |
+| `io.fabric8.tekton.v1beta1.internal.pipeline.pkg.apis.resource.v1alpha1` | `io.fabric8.tekton.v1alpha1`                 |
+| `io.fabric8.tekton.v1beta1.internal.pipeline.pkg.apis.run.v1beta1`       | `io.fabric8.tekton.v1beta1`                  |
+| `io.fabric8.tekton.v1beta1.internal.pipeline.pkg.result`                 | `io.fabric8.tekton.pipeline.pkg.result`      |
+
 ## Deprecations and Removals <a href="#deprecations-and-removals" id="deprecations-and-removals"/>
 
 ### Service Catalog API (extension) removed <a href="#service-catalog-extension" id="service-catalog-extension"/>

diff --git a/extensions/knative/model/pom.xml b/extensions/knative/model/pom.xml
@@ -42,19 +42,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>io.sundr</groupId>
-      <artifactId>builder-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.sundr</groupId>
-      <artifactId>transform-annotations</artifactId>
-    </dependency>
-        <dependency>
-      <groupId>io.sundr</groupId>
-      <artifactId>sundr-codegen-velocity-nodeps</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-core</artifactId>
@@ -63,20 +50,11 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-batch</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-    </dependency>
   </dependencies>
 
   <profiles>

diff --git a/extensions/tekton/client/pom.xml b/extensions/tekton/client/pom.xml
@@ -52,34 +52,9 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>io.sundr</groupId>
-      <artifactId>builder-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.sundr</groupId>
-      <artifactId>transform-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>tekton-model-v1</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>tekton-model-v1alpha1</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>tekton-model-v1beta1</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>tekton-model-triggers-v1alpha1</artifactId>
-    </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
-      <artifactId>tekton-model-triggers-v1beta1</artifactId>
+      <artifactId>tekton-model</artifactId>
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>

diff --git a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1APIGroupClient.java b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1APIGroupClient.java
@@ -19,14 +19,14 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.extension.ClientAdapter;
 import io.fabric8.tekton.client.dsl.V1APIGroupDSL;
-import io.fabric8.tekton.pipeline.v1.Pipeline;
-import io.fabric8.tekton.pipeline.v1.PipelineList;
-import io.fabric8.tekton.pipeline.v1.PipelineRun;
-import io.fabric8.tekton.pipeline.v1.PipelineRunList;
-import io.fabric8.tekton.pipeline.v1.Task;
-import io.fabric8.tekton.pipeline.v1.TaskList;
-import io.fabric8.tekton.pipeline.v1.TaskRun;
-import io.fabric8.tekton.pipeline.v1.TaskRunList;
+import io.fabric8.tekton.v1.Pipeline;
+import io.fabric8.tekton.v1.PipelineList;
+import io.fabric8.tekton.v1.PipelineRun;
+import io.fabric8.tekton.v1.PipelineRunList;
+import io.fabric8.tekton.v1.Task;
+import io.fabric8.tekton.v1.TaskList;
+import io.fabric8.tekton.v1.TaskRun;
+import io.fabric8.tekton.v1.TaskRunList;
 
 public class V1APIGroupClient extends ClientAdapter<V1APIGroupClient> implements V1APIGroupDSL {
 

diff --git a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1beta1APIGroupClient.java b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1beta1APIGroupClient.java
@@ -20,18 +20,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.extension.ClientAdapter;
 import io.fabric8.tekton.client.dsl.V1beta1APIGroupDSL;
-import io.fabric8.tekton.pipeline.v1beta1.ClusterTask;
-import io.fabric8.tekton.pipeline.v1beta1.ClusterTaskList;
-import io.fabric8.tekton.pipeline.v1beta1.CustomRun;
-import io.fabric8.tekton.pipeline.v1beta1.CustomRunList;
-import io.fabric8.tekton.pipeline.v1beta1.Pipeline;
-import io.fabric8.tekton.pipeline.v1beta1.PipelineList;
-import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
-import io.fabric8.tekton.pipeline.v1beta1.PipelineRunList;
-import io.fabric8.tekton.pipeline.v1beta1.Task;
-import io.fabric8.tekton.pipeline.v1beta1.TaskList;
-import io.fabric8.tekton.pipeline.v1beta1.TaskRun;
-import io.fabric8.tekton.pipeline.v1beta1.TaskRunList;
 import io.fabric8.tekton.resolution.v1beta1.ResolutionRequest;
 import io.fabric8.tekton.resolution.v1beta1.ResolutionRequestList;
 import io.fabric8.tekton.triggers.v1beta1.ClusterTriggerBinding;
@@ -44,6 +32,18 @@
 import io.fabric8.tekton.triggers.v1beta1.TriggerList;
 import io.fabric8.tekton.triggers.v1beta1.TriggerTemplate;
 import io.fabric8.tekton.triggers.v1beta1.TriggerTemplateList;
+import io.fabric8.tekton.v1beta1.ClusterTask;
+import io.fabric8.tekton.v1beta1.ClusterTaskList;
+import io.fabric8.tekton.v1beta1.CustomRun;
+import io.fabric8.tekton.v1beta1.CustomRunList;
+import io.fabric8.tekton.v1beta1.Pipeline;
+import io.fabric8.tekton.v1beta1.PipelineList;
+import io.fabric8.tekton.v1beta1.PipelineRun;
+import io.fabric8.tekton.v1beta1.PipelineRunList;
+import io.fabric8.tekton.v1beta1.Task;
+import io.fabric8.tekton.v1beta1.TaskList;
+import io.fabric8.tekton.v1beta1.TaskRun;
+import io.fabric8.tekton.v1beta1.TaskRunList;
 
 public class V1beta1APIGroupClient extends ClientAdapter<V1beta1APIGroupClient> implements V1beta1APIGroupDSL {
 

diff --git a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1APIGroupDSL.java b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1APIGroupDSL.java
@@ -18,14 +18,14 @@
 import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.tekton.pipeline.v1.Pipeline;
-import io.fabric8.tekton.pipeline.v1.PipelineList;
-import io.fabric8.tekton.pipeline.v1.PipelineRun;
-import io.fabric8.tekton.pipeline.v1.PipelineRunList;
-import io.fabric8.tekton.pipeline.v1.Task;
-import io.fabric8.tekton.pipeline.v1.TaskList;
-import io.fabric8.tekton.pipeline.v1.TaskRun;
-import io.fabric8.tekton.pipeline.v1.TaskRunList;
+import io.fabric8.tekton.v1.Pipeline;
+import io.fabric8.tekton.v1.PipelineList;
+import io.fabric8.tekton.v1.PipelineRun;
+import io.fabric8.tekton.v1.PipelineRunList;
+import io.fabric8.tekton.v1.Task;
+import io.fabric8.tekton.v1.TaskList;
+import io.fabric8.tekton.v1.TaskRun;
+import io.fabric8.tekton.v1.TaskRunList;
 
 public interface V1APIGroupDSL extends Client {
   /**

diff --git a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1beta1APIGroupDSL.java b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1beta1APIGroupDSL.java
@@ -19,18 +19,6 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.tekton.pipeline.v1beta1.ClusterTask;
-import io.fabric8.tekton.pipeline.v1beta1.ClusterTaskList;
-import io.fabric8.tekton.pipeline.v1beta1.CustomRun;
-import io.fabric8.tekton.pipeline.v1beta1.CustomRunList;
-import io.fabric8.tekton.pipeline.v1beta1.Pipeline;
-import io.fabric8.tekton.pipeline.v1beta1.PipelineList;
-import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
-import io.fabric8.tekton.pipeline.v1beta1.PipelineRunList;
-import io.fabric8.tekton.pipeline.v1beta1.Task;
-import io.fabric8.tekton.pipeline.v1beta1.TaskList;
-import io.fabric8.tekton.pipeline.v1beta1.TaskRun;
-import io.fabric8.tekton.pipeline.v1beta1.TaskRunList;
 import io.fabric8.tekton.resolution.v1beta1.ResolutionRequest;
 import io.fabric8.tekton.resolution.v1beta1.ResolutionRequestList;
 import io.fabric8.tekton.triggers.v1beta1.ClusterTriggerBinding;
@@ -43,6 +31,18 @@
 import io.fabric8.tekton.triggers.v1beta1.TriggerList;
 import io.fabric8.tekton.triggers.v1beta1.TriggerTemplate;
 import io.fabric8.tekton.triggers.v1beta1.TriggerTemplateList;
+import io.fabric8.tekton.v1beta1.ClusterTask;
+import io.fabric8.tekton.v1beta1.ClusterTaskList;
+import io.fabric8.tekton.v1beta1.CustomRun;
+import io.fabric8.tekton.v1beta1.CustomRunList;
+import io.fabric8.tekton.v1beta1.Pipeline;
+import io.fabric8.tekton.v1beta1.PipelineList;
+import io.fabric8.tekton.v1beta1.PipelineRun;
+import io.fabric8.tekton.v1beta1.PipelineRunList;
+import io.fabric8.tekton.v1beta1.Task;
+import io.fabric8.tekton.v1beta1.TaskList;
+import io.fabric8.tekton.v1beta1.TaskRun;
+import io.fabric8.tekton.v1beta1.TaskRunList;
 
 public interface V1beta1APIGroupDSL extends Client {
   /**

diff --git a/extensions/tekton/examples/src/main/java/io/fabric8/tekton/api/examples/TaskCreate.java b/extensions/tekton/examples/src/main/java/io/fabric8/tekton/api/examples/TaskCreate.java
@@ -17,9 +17,9 @@
 
 import io.fabric8.tekton.client.DefaultTektonClient;
 import io.fabric8.tekton.client.TektonClient;
-import io.fabric8.tekton.pipeline.v1beta1.Task;
-import io.fabric8.tekton.pipeline.v1beta1.TaskBuilder;
-import io.fabric8.tekton.pipeline.v1beta1.TaskList;
+import io.fabric8.tekton.v1beta1.Task;
+import io.fabric8.tekton.v1beta1.TaskBuilder;
+import io.fabric8.tekton.v1beta1.TaskList;
 
 public class TaskCreate {
   public static void main(String[] args) {

diff --git a/extensions/tekton/examples/src/main/java/io/fabric8/tekton/api/examples/TaskRunCancel.java b/extensions/tekton/examples/src/main/java/io/fabric8/tekton/api/examples/TaskRunCancel.java
@@ -18,7 +18,7 @@
 import io.fabric8.knative.pkg.apis.Condition;
 import io.fabric8.tekton.client.DefaultTektonClient;
 import io.fabric8.tekton.client.TektonClient;
-import io.fabric8.tekton.pipeline.v1.TaskRun;
+import io.fabric8.tekton.v1.TaskRun;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/extensions/tekton/examples/src/main/java/io/fabric8/tekton/api/examples/TaskRunCreate.java b/extensions/tekton/examples/src/main/java/io/fabric8/tekton/api/examples/TaskRunCreate.java
@@ -17,12 +17,12 @@
 
 import io.fabric8.tekton.client.DefaultTektonClient;
 import io.fabric8.tekton.client.TektonClient;
-import io.fabric8.tekton.pipeline.v1.StepBuilder;
-import io.fabric8.tekton.pipeline.v1.Task;
-import io.fabric8.tekton.pipeline.v1.TaskBuilder;
-import io.fabric8.tekton.pipeline.v1.TaskRun;
-import io.fabric8.tekton.pipeline.v1.TaskRunBuilder;
-import io.fabric8.tekton.pipeline.v1.TaskRunList;
+import io.fabric8.tekton.v1.StepBuilder;
+import io.fabric8.tekton.v1.Task;
+import io.fabric8.tekton.v1.TaskBuilder;
+import io.fabric8.tekton.v1.TaskRun;
+import io.fabric8.tekton.v1.TaskRunBuilder;
+import io.fabric8.tekton.v1.TaskRunList;
 
 import static io.fabric8.kubernetes.client.utils.Utils.generateId;
 

diff --git a/...s/tekton/examples/src/main/java/io/fabric8/tekton/api/examples/v1beta1/TaskRunCreate.java b/...s/tekton/examples/src/main/java/io/fabric8/tekton/api/examples/v1beta1/TaskRunCreate.java
@@ -17,9 +17,9 @@
 
 import io.fabric8.tekton.client.DefaultTektonClient;
 import io.fabric8.tekton.client.TektonClient;
-import io.fabric8.tekton.pipeline.v1beta1.TaskRun;
-import io.fabric8.tekton.pipeline.v1beta1.TaskRunBuilder;
-import io.fabric8.tekton.pipeline.v1beta1.TaskRunList;
+import io.fabric8.tekton.v1beta1.TaskRun;
+import io.fabric8.tekton.v1beta1.TaskRunBuilder;
+import io.fabric8.tekton.v1beta1.TaskRunList;
 
 public class TaskRunCreate {
   public static void main(String[] args) {

diff --git a/extensions/tekton/generator-triggers/Makefile b/extensions/tekton/generator-triggers/Makefile