revert walle_location rename

Author: kobzonega

api/v1alpha1/configuration.go

@@ -39,7 +39,7 @@ func generateSomeDefaults(cr *Storage, crDB *Database) schema.Configuration {
 			HostConfigID: 1, // TODO
 			NodeID:       i + 1,
 			Port:         InterconnectPort,
-			Location: schema.Location{
+			WalleLocation: schema.WalleLocation{
 				Body:       12340 + i,
 				DataCenter: datacenter,
 				Rack:       strconv.Itoa(i),

internal/configuration/schema/host.go

@@ -1,15 +1,15 @@
 package schema
 
 type Host struct {
-	Address      string   `yaml:"address,omitempty"`
-	Host         string   `yaml:"host"`
-	HostConfigID int      `yaml:"host_config_id"`
-	NodeID       int      `yaml:"node_id"`
-	Port         int      `yaml:"port,omitempty"`
-	Location     Location `yaml:"location,omitempty"`
+	Address       string        `yaml:"address,omitempty"`
+	Host          string        `yaml:"host"`
+	HostConfigID  int           `yaml:"host_config_id"`
+	NodeID        int           `yaml:"node_id"`
+	Port          int           `yaml:"port,omitempty"`
+	WalleLocation WalleLocation `yaml:"walle_location,omitempty"`
 }
 
-type Location struct {
+type WalleLocation struct {
 	Body       int    `yaml:"body"`
 	DataCenter string `yaml:"data_center"`
 	Rack       string `yaml:"rack"`

internal/configuration/schema/schema_test.go

@@ -16,35 +16,35 @@ var configurationExample = `
 ---
 hosts:
 - host: storage-0
-  location: {body: 0, data_center: 'dcExample', rack: '0'}
+  walle_location: {body: 0, data_center: 'dcExample', rack: '0'}
   node_id: 1
   host_config_id: 1
 - host: storage-1
-  location: {body: 1, data_center: 'dcExample', rack: '1'}
+  walle_location: {body: 1, data_center: 'dcExample', rack: '1'}
   node_id: 2
   host_config_id: 1
 - host: storage-2
-  location: {body: 2, data_center: 'dcExample', rack: '2'}
+  walle_location: {body: 2, data_center: 'dcExample', rack: '2'}
   node_id: 3
   host_config_id: 1
 - host: storage-3
-  location: {body: 3, data_center: 'dcExample', rack: '3'}
+  walle_location: {body: 3, data_center: 'dcExample', rack: '3'}
   node_id: 4
   host_config_id: 1
 - host: storage-4
-  location: {body: 4, data_center: 'dcExample', rack: '4'}
+  walle_location: {body: 4, data_center: 'dcExample', rack: '4'}
   node_id: 5
   host_config_id: 1
 - host: storage-5
-  location: {body: 5, data_center: 'dcExample', rack: '5'}
+  walle_location: {body: 5, data_center: 'dcExample', rack: '5'}
   node_id: 6
   host_config_id: 1
 - host: storage-6
-  location: {body: 6, data_center: 'dcExample', rack: '6'}
+  walle_location: {body: 6, data_center: 'dcExample', rack: '6'}
   node_id: 7
   host_config_id: 1
 - host: storage-7
-  location: {body: 7, data_center: 'dcExample', rack: '7'}
+  walle_location: {body: 7, data_center: 'dcExample', rack: '7'}
   node_id: 8
   host_config_id: 1
 key_config:
@@ -95,7 +95,7 @@ var _ = Describe("Testing schema", func() {
 				Host:         fmt.Sprintf("storage-%d", i),
 				NodeID:       i + 1,
 				HostConfigID: 1,
-				Location: schema.Location{
+				Location: schema.WalleLocation{
 					Body:       i,
 					DataCenter: "dcExample",
 					Rack:       fmt.Sprint(i),

internal/resources/resource.go

@@ -45,7 +45,6 @@ const (
 	interconnectTLSVolumeMountPath = "/tls/interconnect"
 	datastreamsTLSVolumeMountPath  = "/tls/datastreams"
 
-	DynConfigNameFormat           = "%s-dynconfig"
 	InitJobNameFormat             = "%s-blobstorage-init"
 	OperatorTokenSecretNameFormat = "%s-operator-token"
 

internal/resources/storage.go

@@ -1,8 +1,6 @@
 package resources
 
 import (
-	"fmt"
-
 	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/rest"
@@ -57,26 +55,14 @@ func (b *StorageClusterBuilder) GetResourceBuilders(restConfig *rest.Config) []R
 			},
 		)
 	} else {
-		// error was previously handled in the ValidationWebhook
-		staticConfig, _ := yaml.Marshal(dynConfig.Config)
+		cfg, _ := yaml.Marshal(dynConfig.Config)
 		optionalBuilders = append(
 			optionalBuilders,
 			&ConfigMapBuilder{
 				Object: b,
 				Name:   b.Storage.GetName(),
 				Data: map[string]string{
-					api.ConfigFileName: string(staticConfig),
-				},
-				Labels: storageLabels,
-			},
-		)
-		optionalBuilders = append(
-			optionalBuilders,
-			&ConfigMapBuilder{
-				Object: b,
-				Name:   fmt.Sprintf(DynConfigNameFormat, b.Storage.GetName()),
-				Data: map[string]string{
-					api.DynconfigFileName: b.Spec.Configuration,
+					api.ConfigFileName: string(cfg),
 				},
 				Labels: storageLabels,
 			},