build(ci): generate fabric8 models 0.1.0-alpha.26 for robot.roboscale…

….io v0.2.7-alpha.6, fleet.roboscale.io v0.1.6-alpha.14 and connection-hub.roboscale.io v0.1.7-alpha.12
robolaunch · Mar 6, 2024 · 0d8f28c · 0d8f28c
1 parent d62f848
commit 0d8f28c
Show file tree

Hide file tree

Showing 61 changed files with 519 additions and 489 deletions.
diff --git a/crds/base/robot.roboscale.io_robots.yaml b/crds/base/robot.roboscale.io_robots.yaml
@@ -140,6 +140,9 @@ spec:
                           with Server's hostname. Used for getting Server's IP over
                           DNS.
                         type: string
+                      protocol:
+                        default: TCP
+                        type: string
                       reference:
                         description: Reference to the `Server` instance. It is used
                           if `.spec.type` is `Client`. Referenced object can be previously

diff --git a/crds/base/robot.roboscale.io_ros2bridges.yaml b/crds/base/robot.roboscale.io_ros2bridges.yaml
@@ -33,7 +33,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: ROS2BridgeSpec defines the desired state of ROS2Bridge.
+            description: Specification of the desired behavior of the ROS2Bridge.
             properties:
               discoveryServerRef:
                 description: Object reference to DiscoveryServer.
@@ -97,7 +97,7 @@ spec:
             - distro
             type: object
           status:
-            description: ROS2BridgeStatus defines the observed state of ROS2Bridge.
+            description: Most recently observed status of the ROS2Bridge.
             properties:
               connectionInfo:
                 description: Connection info obtained from DiscoveryServer.

diff --git a/crds/base/robot.roboscale.io_ros2workloads.yaml b/crds/base/robot.roboscale.io_ros2workloads.yaml
@@ -33,9 +33,86 @@ spec:
           metadata:
             type: object
           spec:
-            description: ROS2WorkloadSpec defines the desired state of ROS2Workload.
+            description: Specification of the desired behavior of the ROS2Workload.
             properties:
-              containers:
+              discoveryServerTemplate:
+                description: Discovery server configurational parameters.
+                properties:
+                  cluster:
+                    description: Cloud instance name that holds DiscoveryServer instance
+                      with `Server` type. Should be empty if the type is `Server`
+                      since it takes cloud instance's name automatically. Should be
+                      set if the type is `Client`.
+                    type: string
+                  domainID:
+                    description: ROS domain ID for robot. See https://docs.ros.org/en/foxy/Concepts/About-Domain-ID.html.
+                    maximum: 101
+                    minimum: 0
+                    type: integer
+                  hostname:
+                    description: If instance type is `Server`, it can be an arbitrary
+                      value. If instance type is `Client`, it should be the same with
+                      Server's hostname. Used for getting Server's IP over DNS.
+                    type: string
+                  protocol:
+                    default: TCP
+                    type: string
+                  reference:
+                    description: Reference to the `Server` instance. It is used if
+                      `.spec.type` is `Client`. Referenced object can be previously
+                      provisioned in another cluster. In that case, cluster's name
+                      can be specified in `.spec.cluster` field.
+                    properties:
+                      apiVersion:
+                        description: API version of the referent.
+                        type: string
+                      fieldPath:
+                        description: 'If referring to a piece of an object instead
+                          of an entire object, this string should contain a valid
+                          JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                          For example, if the object reference is to a container within
+                          a pod, this would take on a value like: "spec.containers{name}"
+                          (where "name" refers to the name of the container that triggered
+                          the event) or if no container name is specified "spec.containers[2]"
+                          (container with index 2 in this pod). This syntax is chosen
+                          only to have some well-defined way of referencing a part
+                          of an object. TODO: this design is not final and this field
+                          is subject to change in the future.'
+                        type: string
+                      kind:
+                        description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                        type: string
+                      name:
+                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                        type: string
+                      namespace:
+                        description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                        type: string
+                      resourceVersion:
+                        description: 'Specific resourceVersion to which this reference
+                          is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                        type: string
+                      uid:
+                        description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  subdomain:
+                    description: If instance type is `Server`, it can be an arbitrary
+                      value. If instance type is `Client`, it should be the same with
+                      Server's subdomain. Used for getting Server's IP over DNS.
+                    type: string
+                  type:
+                    description: Instance type can be either `Server` or `Client`.
+                      If `Server`, instance creates discovery server resources and
+                      workloads. Other `Client` instances can connect to the `Server`
+                      instance. If `Client`, instance tries to connect a `Server`
+                      instance and hold `Server` configuration in a ConfigMap.
+                    type: string
+                required:
+                - domainID
+                type: object
+              launchContainers:
                 description: Configurational parameters for containers that will be
                   encapsulated within the ROS 2 workload StatefulSet.
                 items:
@@ -1318,80 +1395,6 @@ spec:
                   - replicas
                   type: object
                 type: array
-              discoveryServerTemplate:
-                description: Discovery server configurational parameters.
-                properties:
-                  cluster:
-                    description: Cloud instance name that holds DiscoveryServer instance
-                      with `Server` type. Should be empty if the type is `Server`
-                      since it takes cloud instance's name automatically. Should be
-                      set if the type is `Client`.
-                    type: string
-                  domainID:
-                    description: ROS domain ID for robot. See https://docs.ros.org/en/foxy/Concepts/About-Domain-ID.html.
-                    maximum: 101
-                    minimum: 0
-                    type: integer
-                  hostname:
-                    description: If instance type is `Server`, it can be an arbitrary
-                      value. If instance type is `Client`, it should be the same with
-                      Server's hostname. Used for getting Server's IP over DNS.
-                    type: string
-                  reference:
-                    description: Reference to the `Server` instance. It is used if
-                      `.spec.type` is `Client`. Referenced object can be previously
-                      provisioned in another cluster. In that case, cluster's name
-                      can be specified in `.spec.cluster` field.
-                    properties:
-                      apiVersion:
-                        description: API version of the referent.
-                        type: string
-                      fieldPath:
-                        description: 'If referring to a piece of an object instead
-                          of an entire object, this string should contain a valid
-                          JSON/Go field access statement, such as desiredState.manifest.containers[2].
-                          For example, if the object reference is to a container within
-                          a pod, this would take on a value like: "spec.containers{name}"
-                          (where "name" refers to the name of the container that triggered
-                          the event) or if no container name is specified "spec.containers[2]"
-                          (container with index 2 in this pod). This syntax is chosen
-                          only to have some well-defined way of referencing a part
-                          of an object. TODO: this design is not final and this field
-                          is subject to change in the future.'
-                        type: string
-                      kind:
-                        description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                        type: string
-                      name:
-                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
-                        type: string
-                      namespace:
-                        description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
-                        type: string
-                      resourceVersion:
-                        description: 'Specific resourceVersion to which this reference
-                          is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                        type: string
-                      uid:
-                        description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
-                        type: string
-                    type: object
-                    x-kubernetes-map-type: atomic
-                  subdomain:
-                    description: If instance type is `Server`, it can be an arbitrary
-                      value. If instance type is `Client`, it should be the same with
-                      Server's subdomain. Used for getting Server's IP over DNS.
-                    type: string
-                  type:
-                    description: Instance type can be either `Server` or `Client`.
-                      If `Server`, instance creates discovery server resources and
-                      workloads. Other `Client` instances can connect to the `Server`
-                      instance. If `Client`, instance tries to connect a `Server`
-                      instance and hold `Server` configuration in a ConfigMap.
-                    type: string
-                required:
-                - domainID
-                type: object
               ros2BridgeTemplate:
                 description: ROS 2 Bridge configurational parameters.
                 properties:
@@ -1690,7 +1693,7 @@ spec:
             - discoveryServerTemplate
             type: object
           status:
-            description: ROS2WorkloadStatus defines the observed state of ROS2Workload.
+            description: Most recently observed status of the ROS2Workload.
             properties:
               discoveryServerStatus:
                 description: Discovery server instance status.

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.roboscale.robot</groupId>
   <artifactId>robot-fabric8-client</artifactId>
-  <version>0.1.0-alpha.25</version>
+  <version>0.1.0-alpha.26</version>
   <name>robot-fabric8-client</name>
   <url>https://robolaunch.io</url>
   <properties>

diff --git a/src/main/java/io/roboscale/robot/v1alpha1/robotspec/robot/DiscoveryServerTemplate.java b/src/main/java/io/roboscale/robot/v1alpha1/robotspec/robot/DiscoveryServerTemplate.java
@@ -1,7 +1,7 @@
 package io.roboscale.robot.v1alpha1.robotspec.robot;
 
 @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
-@com.fasterxml.jackson.annotation.JsonPropertyOrder({"cluster","domainID","hostname","reference","subdomain","type"})
+@com.fasterxml.jackson.annotation.JsonPropertyOrder({"cluster","domainID","hostname","protocol","reference","subdomain","type"})
 @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @javax.annotation.processing.Generated("io.fabric8.java.generator.CRGeneratorRunner")
 public class DiscoveryServerTemplate implements io.fabric8.kubernetes.api.model.KubernetesResource {
@@ -57,6 +57,18 @@ public void setHostname(String hostname) {
         this.hostname = hostname;
     }
 
+    @com.fasterxml.jackson.annotation.JsonProperty("protocol")
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
+    private String protocol = "TCP";
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+
     /**
      * Reference to the `Server` instance. It is used if `.spec.type` is `Client`. Referenced object can be previously provisioned in another cluster. In that case, cluster's name can be specified in `.spec.cluster` field.
      */

diff --git a/src/main/java/io/roboscale/robot/v1alpha2/ROS2WorkloadSpec.java b/src/main/java/io/roboscale/robot/v1alpha2/ROS2WorkloadSpec.java
@@ -1,27 +1,11 @@
 package io.roboscale.robot.v1alpha2;
 
 @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
-@com.fasterxml.jackson.annotation.JsonPropertyOrder({"containers","discoveryServerTemplate","ros2BridgeTemplate","volumeClaimTemplates"})
+@com.fasterxml.jackson.annotation.JsonPropertyOrder({"discoveryServerTemplate","launchContainers","ros2BridgeTemplate","volumeClaimTemplates"})
 @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @javax.annotation.processing.Generated("io.fabric8.java.generator.CRGeneratorRunner")
 public class ROS2WorkloadSpec implements io.fabric8.kubernetes.api.model.KubernetesResource {
 
-    /**
-     * Configurational parameters for containers that will be encapsulated within the ROS 2 workload StatefulSet.
-     */
-    @com.fasterxml.jackson.annotation.JsonProperty("containers")
-    @com.fasterxml.jackson.annotation.JsonPropertyDescription("Configurational parameters for containers that will be encapsulated within the ROS 2 workload StatefulSet.")
-    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    private java.util.List<io.roboscale.robot.v1alpha2.ros2workloadspec.Containers> containers;
-
-    public java.util.List<io.roboscale.robot.v1alpha2.ros2workloadspec.Containers> getContainers() {
-        return containers;
-    }
-
-    public void setContainers(java.util.List<io.roboscale.robot.v1alpha2.ros2workloadspec.Containers> containers) {
-        this.containers = containers;
-    }
-
     /**
      * Discovery server configurational parameters.
      */
@@ -39,6 +23,22 @@ public void setDiscoveryServerTemplate(io.roboscale.robot.v1alpha2.ros2workloads
         this.discoveryServerTemplate = discoveryServerTemplate;
     }
 
+    /**
+     * Configurational parameters for containers that will be encapsulated within the ROS 2 workload StatefulSet.
+     */
+    @com.fasterxml.jackson.annotation.JsonProperty("launchContainers")
+    @com.fasterxml.jackson.annotation.JsonPropertyDescription("Configurational parameters for containers that will be encapsulated within the ROS 2 workload StatefulSet.")
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
+    private java.util.List<io.roboscale.robot.v1alpha2.ros2workloadspec.LaunchContainers> launchContainers;
+
+    public java.util.List<io.roboscale.robot.v1alpha2.ros2workloadspec.LaunchContainers> getLaunchContainers() {
+        return launchContainers;
+    }
+
+    public void setLaunchContainers(java.util.List<io.roboscale.robot.v1alpha2.ros2workloadspec.LaunchContainers> launchContainers) {
+        this.launchContainers = launchContainers;
+    }
+
     /**
      * ROS 2 Bridge configurational parameters.
      */

diff --git a/src/main/java/io/roboscale/robot/v1alpha2/ros2workloadspec/DiscoveryServerTemplate.java b/src/main/java/io/roboscale/robot/v1alpha2/ros2workloadspec/DiscoveryServerTemplate.java
@@ -1,7 +1,7 @@
 package io.roboscale.robot.v1alpha2.ros2workloadspec;
 
 @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
-@com.fasterxml.jackson.annotation.JsonPropertyOrder({"cluster","domainID","hostname","reference","subdomain","type"})
+@com.fasterxml.jackson.annotation.JsonPropertyOrder({"cluster","domainID","hostname","protocol","reference","subdomain","type"})
 @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @javax.annotation.processing.Generated("io.fabric8.java.generator.CRGeneratorRunner")
 public class DiscoveryServerTemplate implements io.fabric8.kubernetes.api.model.KubernetesResource {
@@ -57,6 +57,18 @@ public void setHostname(String hostname) {
         this.hostname = hostname;
     }
 
+    @com.fasterxml.jackson.annotation.JsonProperty("protocol")
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
+    private String protocol = "TCP";
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+
     /**
      * Reference to the `Server` instance. It is used if `.spec.type` is `Client`. Referenced object can be previously provisioned in another cluster. In that case, cluster's name can be specified in `.spec.cluster` field.
      */

diff --git a/...v1alpha2/ros2workloadspec/Containers.java → ...a2/ros2workloadspec/LaunchContainers.java b/...v1alpha2/ros2workloadspec/Containers.java → ...a2/ros2workloadspec/LaunchContainers.java
@@ -4,21 +4,21 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder({"container","replicas"})
 @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @javax.annotation.processing.Generated("io.fabric8.java.generator.CRGeneratorRunner")
-public class Containers implements io.fabric8.kubernetes.api.model.KubernetesResource {
+public class LaunchContainers implements io.fabric8.kubernetes.api.model.KubernetesResource {
 
     /**
      * Single container configuration for stateful set.
      */
     @com.fasterxml.jackson.annotation.JsonProperty("container")
     @com.fasterxml.jackson.annotation.JsonPropertyDescription("Single container configuration for stateful set.")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    private io.roboscale.robot.v1alpha2.ros2workloadspec.containers.Container container;
+    private io.roboscale.robot.v1alpha2.ros2workloadspec.launchcontainers.Container container;
 
-    public io.roboscale.robot.v1alpha2.ros2workloadspec.containers.Container getContainer() {
+    public io.roboscale.robot.v1alpha2.ros2workloadspec.launchcontainers.Container getContainer() {
         return container;
     }
 
-    public void setContainer(io.roboscale.robot.v1alpha2.ros2workloadspec.containers.Container container) {
+    public void setContainer(io.roboscale.robot.v1alpha2.ros2workloadspec.launchcontainers.Container container) {
         this.container = container;
     }