Support override with Database.configuration (#93)

* feat: support db overwrite

* refactor: better naming for config generation

* chore: bump up chart version

* refactor: concise Build signature

* tweak: slightly increase timeout limits on e2e

Author: Jorres

.github/workflows/e2e.yml

@@ -77,10 +77,10 @@ jobs:
           # TODO namespace and labels are hardcoded in the next command, that is duplication.
           # We should get the label and its value from ./e2e/manifests/*.yaml
           kubectl wait --timeout=15m --for=condition=storageinitialized=true storage -n ydb ycydb
-          kubectl wait --timeout=5m --for=condition=ready pod -n ydb -l ydb-cluster=kind-storage
+          kubectl wait --timeout=10m --for=condition=ready pod -n ydb -l ydb-cluster=kind-storage
 
-          kubectl wait --timeout=5m --for=condition=tenantinitialized=true  database -n ydb database
-          kubectl wait --timeout=5m --for=condition=ready pod -n ydb -l ydb-cluster=kind-database
+          kubectl wait --timeout=10m --for=condition=tenantinitialized=true  database -n ydb database
+          kubectl wait --timeout=10m --for=condition=ready pod -n ydb -l ydb-cluster=kind-database
 
           # Something as a reference for a more complicated check later. Be careful with the yaml indentation!
           # while true; do

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.4.17
+version: 0.4.18
 
 # 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.4.17"
+appVersion: "0.4.18"

internal/configuration/configuration.go

@@ -25,7 +25,7 @@ func hash(text string) string {
 	return fmt.Sprintf("%x", h.Sum(nil))
 }
 
-func generate(cr *v1alpha1.Storage, crDB *v1alpha1.Database) schema.Configuration {
+func generateSomeDefaults(cr *v1alpha1.Storage, crDB *v1alpha1.Database) schema.Configuration {
 	var hosts []schema.Host
 
 	for i := 0; i < int(cr.Spec.Nodes); i++ {
@@ -67,23 +67,41 @@ func generate(cr *v1alpha1.Storage, crDB *v1alpha1.Database) schema.Configuratio
 	}
 }
 
+func tryFillMissingSections(
+	resultConfig map[string]interface{},
+	generatedConfig schema.Configuration,
+) {
+	if resultConfig["hosts"] == nil {
+		resultConfig["hosts"] = generatedConfig.Hosts
+	}
+	if generatedConfig.KeyConfig != nil {
+		resultConfig["key_config"] = generatedConfig.KeyConfig
+	}
+}
+
 func Build(cr *v1alpha1.Storage, crDB *v1alpha1.Database) (map[string]string, error) {
-	crdConfig := make(map[string]interface{})
-	generatedConfig := generate(cr, crDB)
+	config := make(map[string]interface{})
+
+	// If any kind of configuration exists on Database object, then
+	// it will be used to fully override storage object.
+	// This is a temporary solution that should go away when it would
+	// be possible to override Database configuration partially.
+	var rawYamlConfiguration string
+	if crDB != nil && crDB.Spec.Configuration != "" {
+		rawYamlConfiguration = crDB.Spec.Configuration
+	} else {
+		rawYamlConfiguration = cr.Spec.Configuration
+	}
 
-	err := yaml.Unmarshal([]byte(cr.Spec.Configuration), &crdConfig)
+	err := yaml.Unmarshal([]byte(rawYamlConfiguration), &config)
 	if err != nil {
 		return nil, err
 	}
 
-	if crdConfig["hosts"] == nil {
-		crdConfig["hosts"] = generatedConfig.Hosts
-	}
-	if generatedConfig.KeyConfig != nil {
-		crdConfig["key_config"] = generatedConfig.KeyConfig
-	}
+	generatedConfig := generateSomeDefaults(cr, crDB)
+	tryFillMissingSections(config, generatedConfig)
 
-	data, err := yaml.Marshal(crdConfig)
+	data, err := yaml.Marshal(config)
 	if err != nil {
 		return nil, err
 	}