Fixing merge conflicts, syncing with upstream

.github/workflows/build-ci.yml

@@ -11,6 +11,8 @@ on:
       - v[0-9]+
       - v[0-9]+.[0-9]+
       - cryostat-v[0-9]+.[0-9]+
+      # TODO remove once merged into main
+      - cryostat3
 
 env:
   CI_USER: cryostat+bot

.github/workflows/test-ci-push.yml

@@ -11,6 +11,8 @@ on:
       - v[0-9]+
       - v[0-9]+.[0-9]+
       - cryostat-v[0-9]+.[0-9]+
+      # TODO remove once merged into main
+      - cryostat3
 
 jobs:
   check-before-test:

Makefile

@@ -100,7 +100,7 @@ ENVTEST_K8S_VERSION ?= 1.26
 # See: https://github.com/operator-framework/operator-sdk/pull/4762
 #
 # Suffix is the timestamp of the image build, compute with: date -u '+%Y%m%d%H%M%S'
-CUSTOM_SCORECARD_VERSION ?= 2.5.0-$(shell date -u '+%Y%m%d%H%M%S')
+CUSTOM_SCORECARD_VERSION ?= 3.0.0-$(shell date -u '+%Y%m%d%H%M%S')
 export CUSTOM_SCORECARD_IMG ?= $(IMAGE_TAG_BASE)-scorecard:$(CUSTOM_SCORECARD_VERSION)
 
 DEPLOY_NAMESPACE ?= cryostat-operator-system

api/v1beta1/cryostat_conversion.go

@@ -42,15 +42,13 @@ func (src *Cryostat) ConvertTo(dstRaw conversion.Hub) error {
 }
 
 func convertSpecTo(src *CryostatSpec, dst *operatorv1beta2.CryostatSpec) {
-	dst.Minimal = src.Minimal
 	dst.EnableCertManager = src.EnableCertManager
 	dst.TrustedCertSecrets = convertCertSecretsTo(src.TrustedCertSecrets)
 	dst.EventTemplates = convertEventTemplatesTo(src.EventTemplates)
 	dst.StorageOptions = convertStorageOptionsTo(src.StorageOptions)
 	dst.ServiceOptions = convertServiceOptionsTo(src.ServiceOptions)
 	dst.NetworkOptions = convertNetworkOptionsTo(src.NetworkOptions)
 	dst.ReportOptions = convertReportOptionsTo(src.ReportOptions)
-	dst.MaxWsConnections = src.MaxWsConnections
 	dst.JmxCacheOptions = convertJmxCacheOptionsTo(src.JmxCacheOptions)
 	dst.Resources = convertResourceOptionsTo(src.Resources)
 	dst.AuthProperties = convertAuthPropertiesTo(src.AuthProperties)
@@ -158,7 +156,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
@@ -328,15 +325,13 @@ func (dst *Cryostat) ConvertFrom(srcRaw conversion.Hub) error {
 }
 
 func convertSpecFrom(src *operatorv1beta2.CryostatSpec, dst *CryostatSpec) {
-	dst.Minimal = src.Minimal
 	dst.EnableCertManager = src.EnableCertManager
 	dst.TrustedCertSecrets = convertCertSecretsFrom(src.TrustedCertSecrets)
 	dst.EventTemplates = convertEventTemplatesFrom(src.EventTemplates)
 	dst.StorageOptions = convertStorageOptionsFrom(src.StorageOptions)
 	dst.ServiceOptions = convertServiceOptionsFrom(src.ServiceOptions)
 	dst.NetworkOptions = convertNetworkOptionsFrom(src.NetworkOptions)
 	dst.ReportOptions = convertReportOptionsFrom(src.ReportOptions)
-	dst.MaxWsConnections = src.MaxWsConnections
 	dst.JmxCacheOptions = convertJmxCacheOptionsFrom(src.JmxCacheOptions)
 	dst.Resources = convertResourceOptionsFrom(src.Resources)
 	dst.AuthProperties = convertAuthPropertiesFrom(src.AuthProperties)
@@ -444,7 +439,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

@@ -55,7 +55,7 @@ var _ = Describe("Cryostat", func() {
 
 			Expect(converted).To(Equal(newCR))
 		},
-		tableEntries(),
+		tableEntriesTo(),
 	)
 
 	DescribeTable("converting from v1beta2 to v1beta1",
@@ -71,11 +71,26 @@ var _ = Describe("Cryostat", func() {
 
 			Expect(converted).To(Equal(oldCR))
 		},
-		tableEntries(),
+		tableEntriesFrom(),
 	)
 
 })
 
+func tableEntriesTo() []TableEntry {
+	return append(tableEntries(),
+		Entry("WS connections", (*test.TestResources).NewCryostatWithWsConnectionsSpecV1Beta1,
+			(*test.TestResources).NewCryostat),
+		Entry("command config", (*test.TestResources).NewCryostatWithCommandConfigV1Beta1,
+			(*test.TestResources).NewCryostatWithIngress),
+		Entry("minimal mode", (*test.TestResources).NewCryostatWithMinimalModeV1Beta1,
+			(*test.TestResources).NewCryostat),
+	)
+}
+
+func tableEntriesFrom() []TableEntry {
+	return tableEntries()
+}
+
 func tableEntries() []TableEntry {
 	return []TableEntry{
 		Entry("defaults", (*test.TestResources).NewCryostatV1Beta1,
@@ -134,8 +149,6 @@ func tableEntries() []TableEntry {
 			(*test.TestResources).NewCryostatWithBuiltInPortConfigDisabled),
 		Entry("JMX cache options", (*test.TestResources).NewCryostatWithJmxCacheOptionsSpecV1Beta1,
 			(*test.TestResources).NewCryostatWithJmxCacheOptionsSpec),
-		Entry("WS connections", (*test.TestResources).NewCryostatWithWsConnectionsSpecV1Beta1,
-			(*test.TestResources).NewCryostatWithWsConnectionsSpec),
 		Entry("subprocess heap", (*test.TestResources).NewCryostatWithReportSubprocessHeapSpecV1Beta1,
 			(*test.TestResources).NewCryostatWithReportSubprocessHeapSpec),
 		Entry("security", (*test.TestResources).NewCryostatWithSecurityOptionsV1Beta1,

api/v1beta1/cryostat_types.go

@@ -431,7 +431,7 @@ type JmxCacheOptions struct {
 // Cryostat allows you to install Cryostat for a single namespace.
 // It contains configuration options for controlling the Deployment of the Cryostat
 // application and its related components.
-// A ClusterCryostat or Cryostat instance must be created to instruct the operator
+// A Cryostat instance must be created to instruct the operator
 // to deploy the Cryostat application.
 // +operator-sdk:csv:customresourcedefinitions:resources={{Deployment,v1},{Ingress,v1},{PersistentVolumeClaim,v1},{Secret,v1},{Service,v1},{Route,v1},{ConsoleLink,v1}}
 // +kubebuilder:printcolumn:name="Application URL",type=string,JSONPath=`.status.applicationUrl`

api/v1beta2/cryostat_types.go

@@ -31,9 +31,6 @@ type CryostatSpec struct {
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=2
 	TargetNamespaces []string `json:"targetNamespaces,omitempty"`
-	// Deploy a pared-down Cryostat instance with no Grafana Dashboard or JFR Data Source.
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=4,displayName="Minimal Deployment",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
-	Minimal bool `json:"minimal"`
 	// List of TLS certificates to trust when connecting to targets.
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Trusted TLS Certificates"
@@ -64,11 +61,6 @@ type CryostatSpec struct {
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	ReportOptions *ReportConfiguration `json:"reportOptions,omitempty"`
-	// The maximum number of WebSocket client connections allowed (minimum 1, default unlimited).
-	// +optional
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Max WebSocket Connections",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:number"}
-	// +kubebuilder:validation:Minimum=1
-	MaxWsConnections int32 `json:"maxWsConnections,omitempty"`
 	// Options to customize the JMX target connections cache for the Cryostat application.
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="JMX Connections Cache Options"
@@ -356,13 +348,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

@@ -36,7 +36,6 @@ metadata:
           "spec": {
             "enableCertManager": true,
             "eventTemplates": [],
-            "minimal": false,
             "reportOptions": {
               "replicas": 0
             },
@@ -53,8 +52,8 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     categories: Monitoring, Developer Tools
-    containerImage: quay.io/cryostat/cryostat-operator:2.5.0-dev
-    createdAt: "2024-03-27T17:54:03Z"
+    containerImage: quay.io/cryostat/cryostat-operator:3.0.0-dev
+    createdAt: "2024-04-04T17:19:02Z"
     description: JVM monitoring and profiling tool
     operatorframework.io/initialization-resource: |-
       {
@@ -65,7 +64,6 @@ metadata:
         },
         "spec": {
           "enableCertManager": true,
-          "minimal": false,
           "reportOptions": {
             "replicas": 0
           }
@@ -87,8 +85,8 @@ spec:
     owned:
     - description: Cryostat allows you to install Cryostat for a single namespace.
         It contains configuration options for controlling the Deployment of the Cryostat
-        application and its related components. A ClusterCryostat or Cryostat instance
-        must be created to instruct the operator to deploy the Cryostat application.
+        application and its related components. A Cryostat instance must be created
+        to instruct the operator to deploy the Cryostat application.
       displayName: Cryostat
       kind: Cryostat
       name: cryostats.operator.cryostat.io
@@ -533,12 +531,6 @@ spec:
         path: enableCertManager
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
-      - description: Deploy a pared-down Cryostat instance with no Grafana Dashboard
-          or JFR Data Source.
-        displayName: Minimal Deployment
-        path: minimal
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
       - description: Override default authorization properties for Cryostat on OpenShift.
         displayName: Authorization Properties
         path: authProperties
@@ -594,35 +586,10 @@ spec:
         path: jmxCredentialsDatabaseOptions.databaseSecretName
         x-descriptors:
         - urn:alm:descriptor:io.kubernetes:Secret
-      - description: The maximum number of WebSocket client connections allowed (minimum
-          1, default unlimited).
-        displayName: Max WebSocket Connections
-        path: maxWsConnections
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:number
       - description: Options to control how the operator exposes the application outside
           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