chore(discovery): ensure consistent names for discovery options in CRD

Signed-off-by: Thuan Vo <thuan.votann@gmail.com>

api/v1beta1/cryostat_conversion.go

@@ -245,7 +245,7 @@ func convertTargetDiscoveryTo(srcOpts *TargetDiscoveryOptions) *operatorv1beta2.
 	var dstOpts *operatorv1beta2.TargetDiscoveryOptions
 	if srcOpts != nil {
 		dstOpts = &operatorv1beta2.TargetDiscoveryOptions{
-			BuiltInDiscoveryDisabled:  srcOpts.BuiltInDiscoveryDisabled,
+			BuiltInDiscoveryDisabled:  srcOpts.DisableBuiltInDiscovery,
 			DisableBuiltInPortNames:   srcOpts.DisableBuiltInPortNames,
 			DiscoveryPortNames:        srcOpts.DiscoveryPortNames,
 			DisableBuiltInPortNumbers: srcOpts.DisableBuiltInPortNumbers,
@@ -507,7 +507,7 @@ func convertTargetDiscoveryFrom(srcOpts *operatorv1beta2.TargetDiscoveryOptions)
 	var dstOpts *TargetDiscoveryOptions
 	if srcOpts != nil {
 		dstOpts = &TargetDiscoveryOptions{
-			BuiltInDiscoveryDisabled:  srcOpts.BuiltInDiscoveryDisabled,
+			DisableBuiltInDiscovery:   srcOpts.BuiltInDiscoveryDisabled,
 			DisableBuiltInPortNames:   srcOpts.DisableBuiltInPortNames,
 			DiscoveryPortNames:        srcOpts.DiscoveryPortNames,
 			DisableBuiltInPortNumbers: srcOpts.DisableBuiltInPortNumbers,

api/v1beta1/cryostat_types.go

@@ -540,16 +540,16 @@ type TargetDiscoveryOptions struct {
 	// When true, the Cryostat application will disable the built-in discovery mechanisms. Defaults to false.
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Disable Built-in Discovery",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
-	BuiltInDiscoveryDisabled bool `json:"builtInDiscoveryDisabled,omitempty"`
-	// When true, the Cryostat application will use the default port name jfr-jmx to look for JMX connectable targets.
+	DisableBuiltInDiscovery bool `json:"DisablebuiltInDiscovery,omitempty"`
+	// When false and discoveryPortNames is empty, the Cryostat application will use the default port name jfr-jmx to look for JMX connectable targets. Defaults to false.
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Disable Built-in Port Names",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
 	DisableBuiltInPortNames bool `json:"disableBuiltInPortNames,omitempty"`
 	// List of port names that the Cryostat application should look for in order to consider a target as JMX connectable.
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:fieldDependency:targetDiscoveryOptions.disableBuiltInPortNames:true"}
 	DiscoveryPortNames []string `json:"discoveryPortNames,omitempty"`
-	// When true, the Cryostat application will use the default port number 9091 to look for JMX connectable targets.
+	// When false and discoveryPortNumbers is empty, the Cryostat application will use the default port number 9091 to look for JMX connectable targets. Defaults to false.
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Disable Built-in Port Numbers",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
 	DisableBuiltInPortNumbers bool `json:"disableBuiltInPortNumbers,omitempty"`

bundle/manifests/cryostat-operator.clusterserviceversion.yaml

@@ -53,7 +53,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
     containerImage: quay.io/cryostat/cryostat-operator:3.0.0-dev
-    createdAt: "2024-05-20T05:12:58Z"
+    createdAt: "2024-05-22T04:59:49Z"
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {
@@ -437,17 +437,19 @@ spec:
       - description: When true, the Cryostat application will disable the built-in
           discovery mechanisms. Defaults to false.
         displayName: Disable Built-in Discovery
-        path: targetDiscoveryOptions.builtInDiscoveryDisabled
+        path: targetDiscoveryOptions.DisablebuiltInDiscovery
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-      - description: When true, the Cryostat application will use the default port
-          name jfr-jmx to look for JMX connectable targets.
+      - description: When false and discoveryPortNames is empty, the Cryostat application
+          will use the default port name jfr-jmx to look for JMX connectable targets.
+          Defaults to false.
         displayName: Disable Built-in Port Names
         path: targetDiscoveryOptions.disableBuiltInPortNames
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-      - description: When true, the Cryostat application will use the default port
-          number 9091 to look for JMX connectable targets.
+      - description: When false and discoveryPortNumbers is empty, the Cryostat application
+          will use the default port number 9091 to look for JMX connectable targets.
+          Defaults to false.
         displayName: Disable Built-in Port Numbers
         path: targetDiscoveryOptions.disableBuiltInPortNumbers
         x-descriptors:

bundle/manifests/operator.cryostat.io_cryostats.yaml

@@ -4962,17 +4962,19 @@ spec:
                 description: Options to configure the Cryostat application's target
                   discovery mechanisms.
                 properties:
-                  builtInDiscoveryDisabled:
+                  DisablebuiltInDiscovery:
                     description: When true, the Cryostat application will disable
                       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.
+                    description: When false and discoveryPortNames is empty, the Cryostat
+                      application will use the default port name jfr-jmx to look for
+                      JMX connectable targets. Defaults to false.
                     type: boolean
                   disableBuiltInPortNumbers:
-                    description: When true, the Cryostat application will use the
-                      default port number 9091 to look for JMX connectable targets.
+                    description: When false and discoveryPortNumbers is empty, the
+                      Cryostat application will use the default port number 9091 to
+                      look for JMX connectable targets. Defaults to false.
                     type: boolean
                   discoveryPortNames:
                     description: List of port names that the Cryostat application

config/crd/bases/operator.cryostat.io_cryostats.yaml

@@ -4952,17 +4952,19 @@ spec:
                 description: Options to configure the Cryostat application's target
                   discovery mechanisms.
                 properties:
-                  builtInDiscoveryDisabled:
+                  DisablebuiltInDiscovery:
                     description: When true, the Cryostat application will disable
                       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.
+                    description: When false and discoveryPortNames is empty, the Cryostat
+                      application will use the default port name jfr-jmx to look for
+                      JMX connectable targets. Defaults to false.
                     type: boolean
                   disableBuiltInPortNumbers:
-                    description: When true, the Cryostat application will use the
-                      default port number 9091 to look for JMX connectable targets.
+                    description: When false and discoveryPortNumbers is empty, the
+                      Cryostat application will use the default port number 9091 to
+                      look for JMX connectable targets. Defaults to false.
                     type: boolean
                   discoveryPortNames:
                     description: List of port names that the Cryostat application

config/manifests/bases/cryostat-operator.clusterserviceversion.yaml

@@ -804,17 +804,19 @@ spec:
       - description: When true, the Cryostat application will disable the built-in
           discovery mechanisms. Defaults to false.
         displayName: Disable Built-in Discovery
-        path: targetDiscoveryOptions.builtInDiscoveryDisabled
+        path: targetDiscoveryOptions.DisablebuiltInDiscovery
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-      - description: When true, the Cryostat application will use the default port
-          name jfr-jmx to look for JMX connectable targets.
+      - description: When false and discoveryPortNames is empty, the Cryostat application
+          will use the default port name jfr-jmx to look for JMX connectable targets.
+          Defaults to false.
         displayName: Disable Built-in Port Names
         path: targetDiscoveryOptions.disableBuiltInPortNames
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-      - description: When true, the Cryostat application will use the default port
-          number 9091 to look for JMX connectable targets.
+      - description: When false and discoveryPortNumbers is empty, the Cryostat application
+          will use the default port number 9091 to look for JMX connectable targets.
+          Defaults to false.
         displayName: Disable Built-in Port Numbers
         path: targetDiscoveryOptions.disableBuiltInPortNumbers
         x-descriptors:

internal/test/conversion.go

@@ -451,7 +451,7 @@ func (r *TestResources) NewCryostatWithAuthPropertiesV1Beta1() *operatorv1beta1.
 func (r *TestResources) NewCryostatWithBuiltInDiscoveryDisabledV1Beta1() *operatorv1beta1.Cryostat {
 	cr := r.NewCryostatV1Beta1()
 	cr.Spec.TargetDiscoveryOptions = &operatorv1beta1.TargetDiscoveryOptions{
-		BuiltInDiscoveryDisabled: true,
+		DisableBuiltInDiscovery: true,
 	}
 	return cr
 }