Revert "fix panic on GetHostFromConfigEndpoint"

This reverts commit 90969e2.

Author: kobzonega

api/v1alpha1/configuration.go

@@ -122,23 +122,12 @@ func BuildConfiguration(cr *Storage, crDB *Database) ([]byte, error) {
 	return yaml.Marshal(config)
 }
 
-func ParseConfiguration(rawYamlConfiguration string) (schema.Configuration, error) {
-	configuration := schema.Configuration{}
-
-	dynconfig, err := ParseDynconfig(rawYamlConfiguration)
-	if err == nil {
-		config, err := yaml.Marshal(dynconfig.Config)
-		if err != nil {
-			return configuration, err
-		}
-		rawYamlConfiguration = string(config)
-	}
-
+func ParseConfig(rawYamlConfiguration string) (schema.Configuration, error) {
+	config := schema.Configuration{}
 	dec := yaml.NewDecoder(bytes.NewReader([]byte(rawYamlConfiguration)))
 	dec.KnownFields(false)
-	err = dec.Decode(&configuration)
-
-	return configuration, err
+	err := dec.Decode(&config)
+	return config, err
 }
 
 func ParseDynconfig(rawYamlConfiguration string) (schema.Dynconfig, error) {

api/v1alpha1/storage_webhook.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/strings/slices"
@@ -61,12 +62,15 @@ func (r *Storage) GetGRPCServiceEndpoint() string {
 }
 
 func (r *Storage) GetHostFromConfigEndpoint() string {
-	var configuration schema.Configuration
+	configuration := make(map[string]interface{})
 
 	// skip handle error because we already checked in webhook
-	configuration, _ = ParseConfiguration(r.Spec.Configuration)
-	randNum := rand.Intn(len(configuration.Hosts)) // #nosec G404
-	return fmt.Sprintf("%s:%d", configuration.Hosts[randNum].Host, GRPCPort)
+	_ = yaml.Unmarshal([]byte(r.Spec.Configuration), &configuration)
+	hostsConfig := configuration["hosts"].([]schema.Host)
+
+	randNum := rand.Int31n(r.Spec.Nodes) // #nosec G404
+	host := hostsConfig[randNum].Host
+	return fmt.Sprintf("%s:%d", host, GRPCPort)
 }
 
 func (r *Storage) IsStorageEndpointSecure() bool {
@@ -177,9 +181,19 @@ func (r *Storage) ValidateCreate() error {
 
 	var configuration schema.Configuration
 
-	configuration, err := ParseConfiguration(r.Spec.Configuration)
+	rawYamlConfiguration := r.Spec.Configuration
+	dynconfig, err := ParseDynconfig(r.Spec.Configuration)
+	if err == nil {
+		config, err := yaml.Marshal(dynconfig.Config)
+		if err != nil {
+			return fmt.Errorf("failed to parse .config from dynconfig, error: %w", err)
+		}
+		rawYamlConfiguration = string(config)
+	}
+
+	configuration, err = ParseConfig(rawYamlConfiguration)
 	if err != nil {
-		return fmt.Errorf("failed to parse configuration, error: %w", err)
+		return fmt.Errorf("failed to parse .spec.configuration, error: %w", err)
 	}
 
 	var nodesNumber int32
@@ -264,9 +278,21 @@ func hasUpdatesBesidesFrozen(oldStorage, newStorage *Storage) (bool, string) {
 func (r *Storage) ValidateUpdate(old runtime.Object) error {
 	storagelog.Info("validate update", "name", r.Name)
 
-	configuration, err := ParseConfiguration(r.Spec.Configuration)
+	var configuration schema.Configuration
+
+	rawYamlConfiguration := r.Spec.Configuration
+	dynconfig, err := ParseDynconfig(r.Spec.Configuration)
+	if err == nil {
+		config, err := yaml.Marshal(dynconfig.Config)
+		if err != nil {
+			return fmt.Errorf("failed to parse .config from dynconfig, error: %w", err)
+		}
+		rawYamlConfiguration = string(config)
+	}
+
+	configuration, err = ParseConfig(rawYamlConfiguration)
 	if err != nil {
-		return fmt.Errorf("failed to parse configuration, error: %w", err)
+		return fmt.Errorf("failed to parse .spec.configuration, error: %w", err)
 	}
 
 	var nodesNumber int32

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.17
+version: 0.5.16
 
 # 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.17"
+appVersion: "0.5.16"

internal/configuration/schema/schema_test.go

@@ -122,8 +122,8 @@ var _ = Describe("Testing schema", func() {
 		Expect(err).Should(HaveOccurred())
 	})
 
-	It("Parse configuration with static config", func() {
-		yamlConfig, err := v1alpha1.ParseConfiguration(configurationExample)
+	It("Parse static config", func() {
+		yamlConfig, err := v1alpha1.ParseConfig(configurationExample)
 		Expect(err).ShouldNot(HaveOccurred())
 		hosts := []schema.Host{}
 		for i := 0; i < 8; i++ {
@@ -149,9 +149,4 @@ var _ = Describe("Testing schema", func() {
 			},
 		}))
 	})
-
-	It("Parse configuration with dynamic config", func() {
-		_, err := v1alpha1.ParseConfiguration(dynconfigExample)
-		Expect(err).ShouldNot(HaveOccurred())
-	})
 })