Change catalogPersistenceEnabled property name

hazelcast · Aug 14, 2023 · b0c524e · b0c524e
1 parent 4ed2fc8
commit b0c524e
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 24 deletions.
diff --git a/api/v1alpha1/hazelcast_types.go b/api/v1alpha1/hazelcast_types.go
@@ -1065,15 +1065,15 @@ type SQL struct {
 	// +optional
 	StatementTimeout int32 `json:"statementTimeout"`
 
-	// CatalogPersistence sets whether SQL Catalog persistence is enabled for the node.
+	// CatalogPersistenceEnabled 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
 	// +optional
-	CatalogPersistence bool `json:"catalogPersistence"`
+	CatalogPersistenceEnabled bool `json:"catalogPersistenceEnabled"`
 }
 
 // HazelcastStatus defines the observed state of Hazelcast

diff --git a/api/v1alpha1/hazelcast_validation.go b/api/v1alpha1/hazelcast_validation.go
@@ -530,7 +530,7 @@ func (v *hazelcastValidator) validateSQL(h *Hazelcast) {
 		return
 	}
 
-	if h.Spec.SQL.CatalogPersistence && !h.Spec.Persistence.IsEnabled() {
+	if h.Spec.SQL.CatalogPersistenceEnabled && !h.Spec.Persistence.IsEnabled() {
 		v.addErr(field.Forbidden(field.NewPath("spec").Child("sql").Child("catalogPersistence"),
 			"catalogPersistence requires Hazelcast persistence enabled"))
 	}

diff --git a/config/crd/bases/hazelcast.com_hazelcasts.yaml b/config/crd/bases/hazelcast.com_hazelcasts.yaml
@@ -1824,15 +1824,16 @@ spec:
               sql:
                 description: Hazelcast SQL configuration
                 properties:
-                  catalogPersistence:
+                  catalogPersistenceEnabled:
                     default: false
-                    description: 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.
+                    description: CatalogPersistenceEnabled 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.
                     type: boolean
                   statementTimeout:
                     default: 0

diff --git a/controllers/hazelcast/hazelcast_resources.go b/controllers/hazelcast/hazelcast_resources.go
@@ -937,7 +937,7 @@ func hazelcastBasicConfig(h *hazelcastv1alpha1.Hazelcast) config.Hazelcast {
 	if h.Spec.SQL != nil {
 		cfg.SQL = config.SQL{
 			StatementTimeout:   h.Spec.SQL.StatementTimeout,
-			CatalogPersistence: h.Spec.SQL.CatalogPersistence,
+			CatalogPersistence: h.Spec.SQL.CatalogPersistenceEnabled,
 		}
 	}
 

diff --git a/...zelcast-platform-operator/charts/hazelcast-platform-operator-crds/templates/all-crds.yaml b/...zelcast-platform-operator/charts/hazelcast-platform-operator-crds/templates/all-crds.yaml
@@ -2099,15 +2099,16 @@ spec:
               sql:
                 description: Hazelcast SQL configuration
                 properties:
-                  catalogPersistence:
+                  catalogPersistenceEnabled:
                     default: false
-                    description: 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.
+                    description: CatalogPersistenceEnabled 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.
                     type: boolean
                   statementTimeout:
                     default: 0

diff --git a/test/e2e/config/hazelcast/config.go b/test/e2e/config/hazelcast/config.go
@@ -471,7 +471,7 @@ var (
 					},
 				},
 				SQL: &hazelcastv1alpha1.SQL{
-					CatalogPersistence: true,
+					CatalogPersistenceEnabled: true,
 				},
 			},
 		}

diff --git a/test/integration/hazelcast_test.go b/test/integration/hazelcast_test.go
@@ -2067,7 +2067,7 @@ var _ = Describe("Hazelcast CR", func() {
 			It("should fail if Hazelcast persistence is not enabled", Label("fast"), func() {
 				spec := test.HazelcastSpec(defaultHazelcastSpecValues(), ee)
 				spec.SQL = &hazelcastv1alpha1.SQL{
-					CatalogPersistence: true,
+					CatalogPersistenceEnabled: true,
 				}
 
 				hz := &hazelcastv1alpha1.Hazelcast{
@@ -2090,7 +2090,7 @@ var _ = Describe("Hazelcast CR", func() {
 					},
 				}
 				spec.SQL = &hazelcastv1alpha1.SQL{
-					CatalogPersistence: true,
+					CatalogPersistenceEnabled: true,
 				}
 				hz := &hazelcastv1alpha1.Hazelcast{
 					ObjectMeta: randomObjectMeta(namespace),
@@ -2100,7 +2100,7 @@ var _ = Describe("Hazelcast CR", func() {
 				Create(hz)
 				hz = ensureHzStatusIsPending(hz)
 
-				Expect(hz.Spec.SQL.CatalogPersistence).Should(BeTrue())
+				Expect(hz.Spec.SQL.CatalogPersistenceEnabled).Should(BeTrue())
 			})
 		})
 	})