chore(api): remove CommandConfig from NetworkOptions

api/v1beta1/cryostat_conversion.go

@@ -157,7 +157,6 @@ func convertNetworkOptionsTo(srcOpts *NetworkConfigurationList) *operatorv1beta2
 		dstOpts = &operatorv1beta2.NetworkConfigurationList{
 			CoreConfig:    convertNetworkConfigTo(srcOpts.CoreConfig),
 			GrafanaConfig: convertNetworkConfigTo(srcOpts.GrafanaConfig),
-			CommandConfig: convertNetworkConfigTo(srcOpts.CommandConfig), // TODO Remove this from v1beta2 API
 		}
 	}
 	return dstOpts
@@ -442,7 +441,6 @@ func convertNetworkOptionsFrom(srcOpts *operatorv1beta2.NetworkConfigurationList
 		dstOpts = &NetworkConfigurationList{
 			CoreConfig:    convertNetworkConfigFrom(srcOpts.CoreConfig),
 			GrafanaConfig: convertNetworkConfigFrom(srcOpts.GrafanaConfig),
-			CommandConfig: convertNetworkConfigFrom(srcOpts.CommandConfig), // TODO Remove this from v1beta2 API
 		}
 	}
 	return dstOpts

api/v1beta1/cryostat_conversion_test.go

@@ -77,8 +77,11 @@ var _ = Describe("Cryostat", func() {
 })
 
 func tableEntriesTo() []TableEntry {
-	return append(tableEntries(), Entry("WS connections", (*test.TestResources).NewCryostatWithWsConnectionsSpecV1Beta1,
-		(*test.TestResources).NewCryostat))
+	return append(tableEntries(),
+		Entry("WS connections", (*test.TestResources).NewCryostatWithWsConnectionsSpecV1Beta1,
+			(*test.TestResources).NewCryostat),
+		Entry("command config", (*test.TestResources).NewCryostatWithCommandConfigV1Beta1,
+			(*test.TestResources).NewCryostat))
 }
 
 func tableEntriesFrom() []TableEntry {

api/v1beta2/cryostat_types.go

@@ -351,13 +351,6 @@ type NetworkConfigurationList struct {
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	CoreConfig *NetworkConfiguration `json:"coreConfig,omitempty"`
-	// Specifications for how to expose the Cryostat command service,
-	// which serves the WebSocket command channel.
-	// +optional
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
-	//
-	// Deprecated: CommandConfig is no longer used.
-	CommandConfig *NetworkConfiguration `json:"commandConfig,omitempty"`
 	// Specifications for how to expose Cryostat's Grafana service,
 	// which serves the Grafana dashboard.
 	// +optional

bundle/manifests/cryostat-operator.clusterserviceversion.yaml

@@ -54,7 +54,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
     containerImage: quay.io/cryostat/cryostat-operator:2.5.0-dev
-    createdAt: "2024-03-08T17:20:54Z"
+    createdAt: "2024-03-11T18:51:35Z"
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {
@@ -592,25 +592,6 @@ spec:
           of the cluster, such as using an Ingress or Route.
         displayName: Network Options
         path: networkOptions
-      - description: "Specifications for how to expose the Cryostat command service,
-          which serves the WebSocket command channel. \n Deprecated: CommandConfig
-          is no longer used."
-        displayName: Command Config
-        path: networkOptions.commandConfig
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-      - description: Annotations to add to the Ingress or Route during its creation.
-        displayName: Annotations
-        path: networkOptions.commandConfig.annotations
-      - description: Configuration for an Ingress object. Currently subpaths are not
-          supported, so unique hosts must be specified (if a single external IP is
-          being used) to differentiate between ingresses/services.
-        displayName: Ingress Spec
-        path: networkOptions.commandConfig.ingressSpec
-      - description: Labels to add to the Ingress or Route during its creation. The
-          label with key "app" is reserved for use by the operator.
-        displayName: Labels
-        path: networkOptions.commandConfig.labels
       - description: Specifications for how to expose the Cryostat service, which
           serves the Cryostat application.
         displayName: Core Config

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

@@ -142,25 +142,6 @@ spec:
           of the cluster, such as using an Ingress or Route.
         displayName: Network Options
         path: networkOptions
-      - description: "Specifications for how to expose the Cryostat command service,
-          which serves the WebSocket command channel. \n Deprecated: CommandConfig
-          is no longer used."
-        displayName: Command Config
-        path: networkOptions.commandConfig
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:hidden
-      - description: Annotations to add to the Ingress or Route during its creation.
-        displayName: Annotations
-        path: networkOptions.commandConfig.annotations
-      - description: Configuration for an Ingress object. Currently subpaths are not
-          supported, so unique hosts must be specified (if a single external IP is
-          being used) to differentiate between ingresses/services.
-        displayName: Ingress Spec
-        path: networkOptions.commandConfig.ingressSpec
-      - description: Labels to add to the Ingress or Route during its creation. The
-          label with key "app" is reserved for use by the operator.
-        displayName: Labels
-        path: networkOptions.commandConfig.labels
       - description: Specifications for how to expose the Cryostat service, which
           serves the Cryostat application.
         displayName: Core Config

internal/test/conversion.go

@@ -478,6 +478,19 @@ func (r *TestResources) NewCryostatWithWsConnectionsSpecV1Beta1() *operatorv1bet
 	return cr
 }
 
+func (r *TestResources) NewCryostatWithCommandConfigV1Beta1() *operatorv1beta1.Cryostat {
+	commandSVC := r.NewCommandService()
+	commandIng := r.newNetworkConfigurationV1Beta1(commandSVC.Name, commandSVC.Spec.Ports[0].Port)
+	commandIng.Annotations["command"] = "annotation"
+	commandIng.Labels["command"] = "label"
+
+	cr := r.NewCryostatV1Beta1()
+	cr.Spec.NetworkOptions = &operatorv1beta1.NetworkConfigurationList{
+		CommandConfig: &commandIng,
+	}
+	return cr
+}
+
 func (r *TestResources) NewCryostatWithReportSubprocessHeapSpecV1Beta1() *operatorv1beta1.Cryostat {
 	cr := r.NewCryostatV1Beta1()
 	if cr.Spec.ReportOptions == nil {

internal/test/resources.go

@@ -761,6 +761,43 @@ func (r *TestResources) NewGrafanaService() *corev1.Service {
 	}
 }
 
+func (r *TestResources) NewCommandService() *corev1.Service {
+	c := true
+	return &corev1.Service{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      r.Name + "-command",
+			Namespace: r.Namespace,
+			OwnerReferences: []metav1.OwnerReference{
+				{
+					APIVersion: operatorv1beta2.GroupVersion.String(),
+					Kind:       "Cryostat",
+					Name:       r.Name,
+					UID:        "",
+					Controller: &c,
+				},
+			},
+			Labels: map[string]string{
+				"app":       r.Name,
+				"component": "cryostat",
+			},
+		},
+		Spec: corev1.ServiceSpec{
+			Type: corev1.ServiceTypeClusterIP,
+			Selector: map[string]string{
+				"app":       r.Name,
+				"component": "cryostat",
+			},
+			Ports: []corev1.ServicePort{
+				{
+					Name:       "http",
+					Port:       10001,
+					TargetPort: intstr.FromInt(10001),
+				},
+			},
+		},
+	}
+}
+
 func (r *TestResources) NewReportsService() *corev1.Service {
 	c := true
 	return &corev1.Service{