YDBOPS-9635 use configMap from Storage if Database .spec.configuration empty (#199)

Author: kobzonega

api/v1alpha1/database_webhook.go

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

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.6
+version: 0.5.7
 
 # 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.6"
+appVersion: "0.5.7"

internal/controllers/remotedatabasenodeset/controller_test.go

@@ -759,7 +759,7 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
 
 				foundConfigMap := corev1.ConfigMap{}
 				Expect(remoteClient.Get(ctx, types.NamespacedName{
-					Name:      databaseSample.Name,
+					Name:      storageSample.Name,
 					Namespace: testobjects.YdbNamespace,
 				}, &foundConfigMap)).Should(Succeed())
 
@@ -791,7 +791,7 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
 
 				foundConfigMap := corev1.ConfigMap{}
 				Expect(remoteClient.Get(ctx, types.NamespacedName{
-					Name:      databaseSample.Name,
+					Name:      storageSample.Name,
 					Namespace: testobjects.YdbNamespace,
 				}, &foundConfigMap)).Should(Succeed())
 

internal/resources/database.go

@@ -72,18 +72,20 @@ func (b *DatabaseBuilder) GetResourceBuilders(restConfig *rest.Config) []Resourc
 
 	var optionalBuilders []ResourceBuilder
 
-	optionalBuilders = append(
-		optionalBuilders,
-		&ConfigMapBuilder{
-			Object: b,
+	if b.Spec.Configuration != "" {
+		optionalBuilders = append(
+			optionalBuilders,
+			&ConfigMapBuilder{
+				Object: b,
 
-			Name: b.GetName(),
-			Data: map[string]string{
-				api.ConfigFileName: b.Spec.Configuration,
+				Name: b.GetName(),
+				Data: map[string]string{
+					api.ConfigFileName: b.Spec.Configuration,
+				},
+				Labels: databaseLabels,
 			},
-			Labels: databaseLabels,
-		},
-	)
+		)
+	}
 
 	if b.Spec.Monitoring != nil && b.Spec.Monitoring.Enabled {
 		optionalBuilders = append(optionalBuilders,

internal/resources/database_statefulset.go

@@ -144,7 +144,10 @@ func (b *DatabaseStatefulSetBuilder) buildPodTemplateSpec() corev1.PodTemplateSp
 }
 
 func (b *DatabaseStatefulSetBuilder) buildVolumes() []corev1.Volume {
-	configMapName := b.Database.Name
+	configMapName := b.Spec.StorageClusterRef.Name
+	if b.Spec.Configuration != "" {
+		configMapName = b.GetName()
+	}
 
 	volumes := []corev1.Volume{
 		{

internal/resources/remotedatabasenodeset.go

@@ -102,13 +102,23 @@ func (b *RemoteDatabaseNodeSetResource) GetRemoteObjects(
 	}
 
 	// sync ConfigMap
-	remoteObjects = append(remoteObjects,
-		&corev1.ConfigMap{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      b.Spec.DatabaseRef.Name,
-				Namespace: b.Namespace,
-			},
-		})
+	if b.Spec.Configuration != "" {
+		remoteObjects = append(remoteObjects,
+			&corev1.ConfigMap{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      b.Spec.DatabaseRef.Name,
+					Namespace: b.Namespace,
+				},
+			})
+	} else {
+		remoteObjects = append(remoteObjects,
+			&corev1.ConfigMap{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      b.Spec.StorageClusterRef.Name,
+					Namespace: b.Namespace,
+				},
+			})
+	}
 
 	// sync Services
 	remoteObjects = append(remoteObjects,