YDBOPS-9722 fillMissingSections for ConfigMap on operator upgrade (ydb-platform#210)

Author: kobzonega

api/v1alpha1/configuration.go

@@ -89,7 +89,7 @@ func tryFillMissingSections(
 	}
 }
 
-func buildConfiguration(cr *Storage, crDB *Database) (string, error) {
+func BuildConfiguration(cr *Storage, crDB *Database) (string, error) {
 	config := make(map[string]interface{})
 
 	// If any kind of configuration exists on Database object, then

api/v1alpha1/database_webhook.go

@@ -142,7 +142,7 @@ func (r *DatabaseDefaulter) Default(ctx context.Context, obj runtime.Object) err
 	}
 
 	if database.Spec.Configuration != "" || (database.Spec.Encryption != nil && database.Spec.Encryption.Enabled) {
-		configuration, err := buildConfiguration(storage, database)
+		configuration, err := BuildConfiguration(storage, database)
 		if err != nil {
 			return err
 		}

api/v1alpha1/storage_webhook.go

@@ -166,7 +166,7 @@ func (r *StorageDefaulter) Default(ctx context.Context, obj runtime.Object) erro
 		storage.Spec.Domain = DefaultDatabaseDomain
 	}
 
-	configuration, err := buildConfiguration(storage, nil)
+	configuration, err := BuildConfiguration(storage, nil)
 	if err != nil {
 		return err
 	}

deploy/ydb-operator/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.12
+version: 0.5.13
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.12"
+appVersion: "0.5.13"

internal/controllers/remotestoragenodeset/controller_test.go

@@ -192,7 +192,7 @@ var _ = Describe("RemoteStorageNodeSet controller tests", func() {
 				Cluster: testRemoteCluster,
 			},
 			StorageNodeSpec: v1alpha1.StorageNodeSpec{
-				Nodes: 8,
+				Nodes: 2,
 			},
 		})
 		storageSample.Spec.NodeSets = append(storageSample.Spec.NodeSets, v1alpha1.StorageNodeSetSpecInline{
@@ -201,7 +201,7 @@ var _ = Describe("RemoteStorageNodeSet controller tests", func() {
 				Cluster: testRemoteCluster,
 			},
 			StorageNodeSpec: v1alpha1.StorageNodeSpec{
-				Nodes: 4,
+				Nodes: 2,
 			},
 		})
 
@@ -568,7 +568,7 @@ var _ = Describe("RemoteStorageNodeSet controller tests", func() {
 					{
 						Name: testNodeSetName + "-local",
 						StorageNodeSpec: v1alpha1.StorageNodeSpec{
-							Nodes: 4,
+							Nodes: 6,
 						},
 					},
 					{
@@ -577,7 +577,7 @@ var _ = Describe("RemoteStorageNodeSet controller tests", func() {
 							Cluster: testRemoteCluster,
 						},
 						StorageNodeSpec: v1alpha1.StorageNodeSpec{
-							Nodes: 8,
+							Nodes: 2,
 						},
 					},
 				}

internal/resources/database.go

@@ -57,14 +57,17 @@ func (b *DatabaseBuilder) GetResourceBuilders(restConfig *rest.Config) []Resourc
 	var optionalBuilders []ResourceBuilder
 
 	if b.Spec.Configuration != "" {
+		// YDBOPS-9722 backward compatibility
+		cfg, _ := api.BuildConfiguration(b.Storage, b.Unwrap())
+
 		optionalBuilders = append(
 			optionalBuilders,
 			&ConfigMapBuilder{
 				Object: b,
 
 				Name: b.GetName(),
 				Data: map[string]string{
-					api.ConfigFileName: b.Spec.Configuration,
+					api.ConfigFileName: cfg,
 				},
 				Labels: databaseLabels,
 			},

internal/resources/storage.go

@@ -46,13 +46,17 @@ func (b *StorageClusterBuilder) GetResourceBuilders(restConfig *rest.Config) []R
 	statusServiceLabels.Merge(map[string]string{labels.ServiceComponent: labels.StatusComponent})
 
 	var optionalBuilders []ResourceBuilder
+
+	// YDBOPS-9722 backward compatibility
+	cfg, _ := api.BuildConfiguration(b.Unwrap(), nil)
+
 	optionalBuilders = append(
 		optionalBuilders,
 		&ConfigMapBuilder{
 			Object: b,
 			Name:   b.Storage.GetName(),
 			Data: map[string]string{
-				api.ConfigFileName: b.Spec.Configuration,
+				api.ConfigFileName: cfg,
 			},
 			Labels: storageLabels,
 		},