Add Localities to FoundationDBClusterSpec

api/v1beta1/foundationdbcluster_types.go

@@ -356,6 +356,10 @@ type FoundationDBClusterSpec struct {
 	// UseUnifiedImage determines if we should use the unified image rather than
 	// separate images for the main container and the sidecar container.
 	UseUnifiedImage *bool `json:"useUnifiedImage,omitempty"`
+
+	// Localities is used to configure the cluster localities for three_data_hall
+	// and three_data_center deployments
+	Localities []Locality `json:"localities,omitempty"`
 }
 
 // ImageType defines a single kind of images used in the cluster.
@@ -2278,3 +2282,20 @@ func (cluster *FoundationDBCluster) GetProcessClassLabels() []string {
 
 	return []string{FDBProcessClassLabel}
 }
+
+// Locality represents the locality for the cluster.
+type Locality struct {
+	Key         string `json:"key,omitempty"`
+	Value       string `json:"value,omitempty"`
+	EnvValue    string `json:"envValue,omitempty"`
+	TopologyKey string `json:"topologyKey,omitempty"`
+}
+
+// GetLocalities returns the cluster localities
+func (cluster *FoundationDBCluster) GetLocalities() []Locality {
+	result := make([]Locality, 0)
+
+	result = append(result, cluster.Spec.Localities...)
+
+	return result
+}

api/v1beta1/foundationdbcluster_types_test.go

@@ -3735,4 +3735,47 @@ var _ = Describe("[api] FoundationDBCluster", func() {
 			),
 		)
 	})
+
+	When("getting cluster localities", func() {
+		It("should return the localities", func() {
+			cluster := &FoundationDBCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "foo",
+					Namespace: "default",
+				},
+				Spec: FoundationDBClusterSpec{
+					Version: Versions.Default.String(),
+					Localities: []Locality{
+						{
+							Key:         "data_hall",
+							Value:       "",
+							EnvValue:    "",
+							TopologyKey: "topology.kubernetes.io/zone",
+						},
+						{
+							Key:         "zone",
+							Value:       "",
+							EnvValue:    "MyFancyZone",
+							TopologyKey: "kubernetes.io/hostname",
+						},
+					},
+				},
+			}
+
+			Expect(cluster.GetLocalities()).To(Equal([]Locality{
+				{
+					Key:         "data_hall",
+					Value:       "",
+					EnvValue:    "",
+					TopologyKey: "topology.kubernetes.io/zone",
+				},
+				{
+					Key:         "zone",
+					Value:       "",
+					EnvValue:    "MyFancyZone",
+					TopologyKey: "kubernetes.io/hostname",
+				},
+			}))
+		})
+	})
 })

api/v1beta2/foundationdb_database_configuration.go

@@ -579,7 +579,6 @@ func (configuration DatabaseConfiguration) AreSeparatedProxiesConfigured() bool
 // AreSeparatedProxiesConfigured(), then this function will return the
 // string "commit_proxies=%d grv_proxies=%d", otherwise just
 // "proxies=%d" using the correct counts of the configuration object.
-//
 func (configuration DatabaseConfiguration) GetProxiesString(version Version) string {
 	counts := configuration.GetRoleCountsWithDefaults(version, DesiredFaultTolerance(configuration.RedundancyMode))
 	if version.HasSeparatedProxies() && configuration.AreSeparatedProxiesConfigured() {

api/v1beta2/groupversion_info.go

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1beta2 contains API Schema definitions for the apps v1beta2 API group
-//+kubebuilder:object:generate=true
-//+groupName=apps.foundationdb.org
+// +kubebuilder:object:generate=true
+// +groupName=apps.foundationdb.org
 package v1beta2
 
 import (

config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml

@@ -1485,6 +1485,19 @@ spec:
                       type: string
                     type: object
                 type: object
+              localities:
+                items:
+                  properties:
+                    envValue:
+                      type: string
+                    key:
+                      type: string
+                    topologyKey:
+                      type: string
+                    value:
+                      type: string
+                  type: object
+                type: array
               lockOptions:
                 properties:
                   denyList: