feat(discovery): options to configure discovery port names and numbers (

#715) Signed-off-by: Thuan Vo <thuan.votann@gmail.com>
cryostatio · Feb 22, 2024 · 62f848c · 62f848c
1 parent d38a00f
commit 62f848c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 6 deletions.
diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@@ -843,7 +843,7 @@ spec:
         displayName: Target Discovery Options
         path: targetDiscoveryOptions
       - description: When true, the Cryostat application will disable the built-in
-          discovery mechanisms. Defaults to false
+          discovery mechanisms. Defaults to false.
         displayName: Disable Built-in Discovery
         path: targetDiscoveryOptions.builtInDiscoveryDisabled
         x-descriptors:

diff --git a/bundle/manifests/operator.cryostat.io_clustercryostats.yaml b/bundle/manifests/operator.cryostat.io_clustercryostats.yaml
@@ -4774,8 +4774,29 @@ spec:
                 properties:
                   builtInDiscoveryDisabled:
                     description: When true, the Cryostat application will disable
-                      the built-in discovery mechanisms. Defaults to false
+                      the built-in discovery mechanisms. Defaults to false.
                     type: boolean
+                  disableBuiltInPortNames:
+                    description: When true, the Cryostat application will use the
+                      default port name jfr-jmx to look for JMX connectable targets.
+                    type: boolean
+                  disableBuiltInPortNumbers:
+                    description: When true, the Cryostat application will use the
+                      default port number 9091 to look for JMX connectable targets.
+                    type: boolean
+                  discoveryPortNames:
+                    description: List of port names that the Cryostat application
+                      should look for in order to consider a target as JMX connectable.
+                    items:
+                      type: string
+                    type: array
+                  discoveryPortNumbers:
+                    description: List of port numbers that the Cryostat application
+                      should look for in order to consider a target as JMX connectable.
+                    items:
+                      format: int32
+                      type: integer
+                    type: array
                 type: object
               targetNamespaces:
                 description: 'List of namespaces whose workloads Cryostat should be

diff --git a/bundle/manifests/operator.cryostat.io_cryostats.yaml b/bundle/manifests/operator.cryostat.io_cryostats.yaml
@@ -9693,7 +9693,7 @@ spec:
                 properties:
                   builtInDiscoveryDisabled:
                     description: When true, the Cryostat application will disable
-                      the built-in discovery mechanisms. Defaults to false
+                      the built-in discovery mechanisms. Defaults to false.
                     type: boolean
                   disableBuiltInPortNames:
                     description: When true, the Cryostat application will use the

diff --git a/config/crd/bases/operator.cryostat.io_clustercryostats.yaml b/config/crd/bases/operator.cryostat.io_clustercryostats.yaml
@@ -4969,8 +4969,29 @@ spec:
                 properties:
                   builtInDiscoveryDisabled:
                     description: When true, the Cryostat application will disable
-                      the built-in discovery mechanisms. Defaults to false
+                      the built-in discovery mechanisms. Defaults to false.
                     type: boolean
+                  disableBuiltInPortNames:
+                    description: When true, the Cryostat application will use the
+                      default port name jfr-jmx to look for JMX connectable targets.
+                    type: boolean
+                  disableBuiltInPortNumbers:
+                    description: When true, the Cryostat application will use the
+                      default port number 9091 to look for JMX connectable targets.
+                    type: boolean
+                  discoveryPortNames:
+                    description: List of port names that the Cryostat application
+                      should look for in order to consider a target as JMX connectable.
+                    items:
+                      type: string
+                    type: array
+                  discoveryPortNumbers:
+                    description: List of port numbers that the Cryostat application
+                      should look for in order to consider a target as JMX connectable.
+                    items:
+                      format: int32
+                      type: integer
+                    type: array
                 type: object
               targetNamespaces:
                 description: 'List of namespaces whose workloads Cryostat should be

diff --git a/config/crd/bases/operator.cryostat.io_cryostats.yaml b/config/crd/bases/operator.cryostat.io_cryostats.yaml
@@ -9686,7 +9686,7 @@ spec:
                 properties:
                   builtInDiscoveryDisabled:
                     description: When true, the Cryostat application will disable
-                      the built-in discovery mechanisms. Defaults to false
+                      the built-in discovery mechanisms. Defaults to false.
                     type: boolean
                   disableBuiltInPortNames:
                     description: When true, the Cryostat application will use the

diff --git a/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml b/config/manifests/bases/cryostat-operator.clusterserviceversion.yaml
@@ -393,7 +393,7 @@ spec:
         displayName: Target Discovery Options
         path: targetDiscoveryOptions
       - description: When true, the Cryostat application will disable the built-in
-          discovery mechanisms. Defaults to false
+          discovery mechanisms. Defaults to false.
         displayName: Disable Built-in Discovery
         path: targetDiscoveryOptions.builtInDiscoveryDisabled
         x-descriptors: