[CN-945] Add SQL configuration in Hazelcast CR

api/v1alpha1/hazelcast_types.go

@@ -163,6 +163,9 @@ type HazelcastSpec struct {
 	// This configuration from the ConfigMap might be overridden by the Hazelcast CR configuration.
 	// +optional
 	CustomConfigCmName string `json:"customConfigCmName,omitempty"`
+
+	// Hazelcast SQL configuration
+	SQL *SQL `json:"sql,omitempty"`
 }
 
 func (s *HazelcastSpec) GetLicenseKeySecretName() string {
@@ -1054,6 +1057,22 @@ type TLS struct {
 	MutualAuthentication MutualAuthentication `json:"mutualAuthentication,omitempty"`
 }
 
+type SQL struct {
+	// StatementTimeout defines the timeout in milliseconds that is applied
+	// to queries without an explicit timeout.
+	// +kubebuilder:default:=0
+	StatementTimeout int32 `json:"statementTimeout"`
+
+	// CatalogPersistence sets whether SQL Catalog persistence is enabled for the node.
+	// With SQL Catalog persistence enabled you can restart the whole cluster without
+	// losing schema definition objects (such as MAPPINGs, TYPEs, VIEWs and DATA CONNECTIONs).
+	// The feature is implemented on top of the Hot Restart feature of Hazelcast
+	// which persists the data to disk. If enabled, you have to also configure
+	// Hot Restart. Feature is disabled by default.
+	// +kubebuilder:default:=false
+	CatalogPersistence bool `json:"catalogPersistence"`
+}
+
 // HazelcastStatus defines the observed state of Hazelcast
 type HazelcastStatus struct {
 	// Phase of the Hazelcast cluster

controllers/hazelcast/hazelcast_resources.go

@@ -933,6 +933,14 @@ func hazelcastBasicConfig(h *hazelcastv1alpha1.Hazelcast) config.Hazelcast {
 			Properties:       NewSSLProperties(jksPath, password, "TLS", h.Spec.TLS.MutualAuthentication),
 		}
 	}
+
+	if h.Spec.SQL != nil {
+		cfg.SQL = config.SQL{
+			StatementTimeout:   h.Spec.SQL.StatementTimeout,
+			CatalogPersistence: h.Spec.SQL.CatalogPersistence,
+		}
+	}
+
 	return cfg
 }
 

internal/config/hazelcast.go

@@ -25,6 +25,7 @@ type Hazelcast struct {
 	AdvancedNetwork          AdvancedNetwork                     `yaml:"advanced-network,omitempty"`
 	ManagementCenter         ManagementCenterConfig              `yaml:"management-center,omitempty"`
 	Serialization            Serialization                       `yaml:"serialization,omitempty"`
+	SQL                      SQL                                 `yaml:"sql,omitempty"`
 }
 
 type ManagementCenterConfig struct {
@@ -406,3 +407,8 @@ type ClassFactories struct {
 	FactoryId int32  `yaml:"factory-id"`
 	ClassName string `yaml:"class-name"`
 }
+
+type SQL struct {
+	StatementTimeout   int32 `yaml:"statement-timeout-millis"`
+	CatalogPersistence bool  `yaml:"catalog-persistence-enabled"`
+}