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

….io v0.2.7-alpha.1, fleet.roboscale.io v0.1.6-alpha.14 and connection-hub.roboscale.io v0.1.7-alpha.11
robolaunch · Feb 5, 2024 · fafb24a · fafb24a
1 parent 3a72dbd
commit fafb24a
Show file tree

Hide file tree

Showing 12 changed files with 156 additions and 193 deletions.
diff --git a/crds/base/robot.roboscale.io_buildmanagers.yaml b/crds/base/robot.roboscale.io_buildmanagers.yaml
@@ -191,6 +191,9 @@ spec:
                         scopeType:
                           description: Type of the scope. Allowed scopes are `Workspace`
                             and `Path`.
+                          enum:
+                          - Workspace
+                          - Path
                           type: string
                         workspace:
                           description: Name of the workspace. Should be selected among
@@ -472,6 +475,9 @@ spec:
                             scopeType:
                               description: Type of the scope. Allowed scopes are `Workspace`
                                 and `Path`.
+                              enum:
+                              - Workspace
+                              - Path
                               type: string
                             workspace:
                               description: Name of the workspace. Should be selected

diff --git a/crds/base/robot.roboscale.io_launchmanagers.yaml b/crds/base/robot.roboscale.io_launchmanagers.yaml
@@ -256,6 +256,9 @@ spec:
                         scopeType:
                           description: Type of the scope. Allowed scopes are `Workspace`
                             and `Path`.
+                          enum:
+                          - Workspace
+                          - Path
                           type: string
                         workspace:
                           description: Name of the workspace. Should be selected among

diff --git a/crds/base/robot.roboscale.io_robots.yaml b/crds/base/robot.roboscale.io_robots.yaml
@@ -117,6 +117,9 @@ spec:
                 description: Holds robot's configuration. Applied if `.spec.type`
                   is `Robot` and must be `nil` otherwise.
                 properties:
+                  bridgeEnabled:
+                    description: If enabled, ROSBridge object will be created.
+                    type: boolean
                   discoveryServerTemplate:
                     description: Discovery server configurational parameters.
                     properties:
@@ -225,40 +228,17 @@ spec:
                   rosBridgeTemplate:
                     description: ROS bridge configurational parameters.
                     properties:
+                      distro:
+                        description: Configurational parameters for ROS 2 bridge.
+                        enum:
+                        - foxy
+                        - galactic
+                        - humble
+                        type: string
                       ingress:
                         description: '[*alpha*] ROSBridge will create an Ingress resource
                           if `true`.'
                         type: boolean
-                      ros:
-                        description: Configurational parameters for ROS bridge.
-                        properties:
-                          distro:
-                            description: ROS distribution for bridge.
-                            enum:
-                            - foxy
-                            - galactic
-                            - humble
-                            type: string
-                          enabled:
-                            description: If `true`, resources and workloads are created
-                              by ROSBridge.
-                            type: boolean
-                        type: object
-                      ros2:
-                        description: Configurational parameters for ROS 2 bridge.
-                        properties:
-                          distro:
-                            description: ROS distribution for bridge.
-                            enum:
-                            - foxy
-                            - galactic
-                            - humble
-                            type: string
-                          enabled:
-                            description: If `true`, resources and workloads are created
-                              by ROSBridge.
-                            type: boolean
-                        type: object
                       serviceType:
                         description: Service type of ROSBridge. `ClusterIP` and `NodePort`
                           is supported.
@@ -942,6 +922,9 @@ spec:
                                     scopeType:
                                       description: Type of the scope. Allowed scopes
                                         are `Workspace` and `Path`.
+                                      enum:
+                                      - Workspace
+                                      - Path
                                       type: string
                                     workspace:
                                       description: Name of the workspace. Should be

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.20</version>
+  <version>0.1.0-alpha.21</version>
   <name>robot-fabric8-client</name>
   <url>https://robolaunch.io</url>
   <properties>

diff --git a/src/main/java/io/roboscale/robot/v1alpha1/buildmanagerspec/steps/Scope.java b/src/main/java/io/roboscale/robot/v1alpha1/buildmanagerspec/steps/Scope.java
@@ -22,20 +22,38 @@ public void setPath(String path) {
         this.path = path;
     }
 
+    public enum ScopeType {
+
+        @com.fasterxml.jackson.annotation.JsonProperty("Workspace")
+        WORKSPACE("Workspace"), @com.fasterxml.jackson.annotation.JsonProperty("Path")
+        PATH("Path");
+
+        java.lang.String value;
+
+        ScopeType(java.lang.String value) {
+            this.value = value;
+        }
+
+        @com.fasterxml.jackson.annotation.JsonValue()
+        public java.lang.String getValue() {
+            return value;
+        }
+    }
+
     /**
      * Type of the scope. Allowed scopes are `Workspace` and `Path`.
      */
     @com.fasterxml.jackson.annotation.JsonProperty("scopeType")
     @io.fabric8.generator.annotation.Required()
     @com.fasterxml.jackson.annotation.JsonPropertyDescription("Type of the scope. Allowed scopes are `Workspace` and `Path`.")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    private String scopeType;
+    private ScopeType scopeType;
 
-    public String getScopeType() {
+    public ScopeType getScopeType() {
         return scopeType;
     }
 
-    public void setScopeType(String scopeType) {
+    public void setScopeType(ScopeType scopeType) {
         this.scopeType = scopeType;
     }
 

diff --git a/src/main/java/io/roboscale/robot/v1alpha1/buildmanagerstatus/steps/step/Scope.java b/src/main/java/io/roboscale/robot/v1alpha1/buildmanagerstatus/steps/step/Scope.java
@@ -22,20 +22,38 @@ public void setPath(String path) {
         this.path = path;
     }
 
+    public enum ScopeType {
+
+        @com.fasterxml.jackson.annotation.JsonProperty("Workspace")
+        WORKSPACE("Workspace"), @com.fasterxml.jackson.annotation.JsonProperty("Path")
+        PATH("Path");
+
+        java.lang.String value;
+
+        ScopeType(java.lang.String value) {
+            this.value = value;
+        }
+
+        @com.fasterxml.jackson.annotation.JsonValue()
+        public java.lang.String getValue() {
+            return value;
+        }
+    }
+
     /**
      * Type of the scope. Allowed scopes are `Workspace` and `Path`.
      */
     @com.fasterxml.jackson.annotation.JsonProperty("scopeType")
     @io.fabric8.generator.annotation.Required()
     @com.fasterxml.jackson.annotation.JsonPropertyDescription("Type of the scope. Allowed scopes are `Workspace` and `Path`.")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    private String scopeType;
+    private ScopeType scopeType;
 
-    public String getScopeType() {
+    public ScopeType getScopeType() {
         return scopeType;
     }
 
-    public void setScopeType(String scopeType) {
+    public void setScopeType(ScopeType scopeType) {
         this.scopeType = scopeType;
     }
 

diff --git a/src/main/java/io/roboscale/robot/v1alpha1/launchmanagerspec/launches/Scope.java b/src/main/java/io/roboscale/robot/v1alpha1/launchmanagerspec/launches/Scope.java
@@ -22,20 +22,38 @@ public void setPath(String path) {
         this.path = path;
     }
 
+    public enum ScopeType {
+
+        @com.fasterxml.jackson.annotation.JsonProperty("Workspace")
+        WORKSPACE("Workspace"), @com.fasterxml.jackson.annotation.JsonProperty("Path")
+        PATH("Path");
+
+        java.lang.String value;
+
+        ScopeType(java.lang.String value) {
+            this.value = value;
+        }
+
+        @com.fasterxml.jackson.annotation.JsonValue()
+        public java.lang.String getValue() {
+            return value;
+        }
+    }
+
     /**
      * Type of the scope. Allowed scopes are `Workspace` and `Path`.
      */
     @com.fasterxml.jackson.annotation.JsonProperty("scopeType")
     @io.fabric8.generator.annotation.Required()
     @com.fasterxml.jackson.annotation.JsonPropertyDescription("Type of the scope. Allowed scopes are `Workspace` and `Path`.")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    private String scopeType;
+    private ScopeType scopeType;
 
-    public String getScopeType() {
+    public ScopeType getScopeType() {
         return scopeType;
     }
 
-    public void setScopeType(String scopeType) {
+    public void setScopeType(ScopeType scopeType) {
         this.scopeType = scopeType;
     }
 

diff --git a/src/main/java/io/roboscale/robot/v1alpha1/robotspec/Robot.java b/src/main/java/io/roboscale/robot/v1alpha1/robotspec/Robot.java
@@ -1,11 +1,27 @@
 package io.roboscale.robot.v1alpha1.robotspec;
 
 @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
-@com.fasterxml.jackson.annotation.JsonPropertyOrder({"discoveryServerTemplate","distributions","domainID","rmwImplementation","rosBridgeTemplate"})
+@com.fasterxml.jackson.annotation.JsonPropertyOrder({"bridgeEnabled","discoveryServerTemplate","distributions","domainID","rmwImplementation","rosBridgeTemplate"})
 @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 Robot implements io.fabric8.kubernetes.api.model.KubernetesResource {
 
+    /**
+     * If enabled, ROSBridge object will be created.
+     */
+    @com.fasterxml.jackson.annotation.JsonProperty("bridgeEnabled")
+    @com.fasterxml.jackson.annotation.JsonPropertyDescription("If enabled, ROSBridge object will be created.")
+    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
+    private Boolean bridgeEnabled;
+
+    public Boolean getBridgeEnabled() {
+        return bridgeEnabled;
+    }
+
+    public void setBridgeEnabled(Boolean bridgeEnabled) {
+        this.bridgeEnabled = bridgeEnabled;
+    }
+
     /**
      * Discovery server configurational parameters.
      */

diff --git a/src/main/java/io/roboscale/robot/v1alpha1/robotspec/robot/RosBridgeTemplate.java b/src/main/java/io/roboscale/robot/v1alpha1/robotspec/robot/RosBridgeTemplate.java
@@ -1,57 +1,60 @@
 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({"ingress","ros","ros2","serviceType"})
+@com.fasterxml.jackson.annotation.JsonPropertyOrder({"distro","ingress","serviceType"})
 @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 RosBridgeTemplate implements io.fabric8.kubernetes.api.model.KubernetesResource {
 
-    /**
-     * [*alpha*] ROSBridge will create an Ingress resource if `true`.
-     */
-    @com.fasterxml.jackson.annotation.JsonProperty("ingress")
-    @com.fasterxml.jackson.annotation.JsonPropertyDescription("[*alpha*] ROSBridge will create an Ingress resource if `true`.")
-    @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    private Boolean ingress;
+    public enum Distro {
 
-    public Boolean getIngress() {
-        return ingress;
-    }
+        @com.fasterxml.jackson.annotation.JsonProperty("foxy")
+        FOXY("foxy"), @com.fasterxml.jackson.annotation.JsonProperty("galactic")
+        GALACTIC("galactic"), @com.fasterxml.jackson.annotation.JsonProperty("humble")
+        HUMBLE("humble");
 
-    public void setIngress(Boolean ingress) {
-        this.ingress = ingress;
+        java.lang.String value;
+
+        Distro(java.lang.String value) {
+            this.value = value;
+        }
+
+        @com.fasterxml.jackson.annotation.JsonValue()
+        public java.lang.String getValue() {
+            return value;
+        }
     }
 
     /**
-     * Configurational parameters for ROS bridge.
+     * Configurational parameters for ROS 2 bridge.
      */
-    @com.fasterxml.jackson.annotation.JsonProperty("ros")
-    @com.fasterxml.jackson.annotation.JsonPropertyDescription("Configurational parameters for ROS bridge.")
+    @com.fasterxml.jackson.annotation.JsonProperty("distro")
+    @com.fasterxml.jackson.annotation.JsonPropertyDescription("Configurational parameters for ROS 2 bridge.")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    private io.roboscale.robot.v1alpha1.robotspec.robot.rosbridgetemplate.Ros ros;
+    private Distro distro;
 
-    public io.roboscale.robot.v1alpha1.robotspec.robot.rosbridgetemplate.Ros getRos() {
-        return ros;
+    public Distro getDistro() {
+        return distro;
     }
 
-    public void setRos(io.roboscale.robot.v1alpha1.robotspec.robot.rosbridgetemplate.Ros ros) {
-        this.ros = ros;
+    public void setDistro(Distro distro) {
+        this.distro = distro;
     }
 
     /**
-     * Configurational parameters for ROS 2 bridge.
+     * [*alpha*] ROSBridge will create an Ingress resource if `true`.
      */
-    @com.fasterxml.jackson.annotation.JsonProperty("ros2")
-    @com.fasterxml.jackson.annotation.JsonPropertyDescription("Configurational parameters for ROS 2 bridge.")
+    @com.fasterxml.jackson.annotation.JsonProperty("ingress")
+    @com.fasterxml.jackson.annotation.JsonPropertyDescription("[*alpha*] ROSBridge will create an Ingress resource if `true`.")
     @com.fasterxml.jackson.annotation.JsonSetter(nulls = com.fasterxml.jackson.annotation.Nulls.SKIP)
-    private io.roboscale.robot.v1alpha1.robotspec.robot.rosbridgetemplate.Ros2 ros2;
+    private Boolean ingress;
 
-    public io.roboscale.robot.v1alpha1.robotspec.robot.rosbridgetemplate.Ros2 getRos2() {
-        return ros2;
+    public Boolean getIngress() {
+        return ingress;
     }
 
-    public void setRos2(io.roboscale.robot.v1alpha1.robotspec.robot.rosbridgetemplate.Ros2 ros2) {
-        this.ros2 = ros2;
+    public void setIngress(Boolean ingress) {
+        this.ingress = ingress;
     }
 
     public enum ServiceType {