Support loadBalancerSourceRanges configuration for master/replica ser…

…vices
bitpoke · Nov 4, 2021 · 4695712 · 4695712
1 parent 32164d0
commit 4695712
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 0 deletions.
diff --git a/config/crd/bases/mysql.presslabs.org_mysqlclusters.yaml b/config/crd/bases/mysql.presslabs.org_mysqlclusters.yaml
@@ -54,6 +54,12 @@ spec:
               MasterServiceSpec:
                 description: Master service extra specification
                 properties:
+                  allowedSourceRanges:
+                    description: AllowedSourceRanges sets a list of CIDR blocks allowed
+                      to access the cluster using LoadBalancer service.
+                    items:
+                      type: string
+                    type: array
                   annotations:
                     additionalProperties:
                       type: string
@@ -6178,6 +6184,12 @@ spec:
               replicaServiceSpec:
                 description: Healthy replica service extra specification
                 properties:
+                  allowedSourceRanges:
+                    description: AllowedSourceRanges sets a list of CIDR blocks allowed
+                      to access the cluster using LoadBalancer service.
+                    items:
+                      type: string
+                    type: array
                   annotations:
                     additionalProperties:
                       type: string

diff --git a/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlclusters.yaml b/deploy/charts/mysql-operator/crds/mysql.presslabs.org_mysqlclusters.yaml
@@ -49,6 +49,11 @@ spec:
                 MasterServiceSpec:
                   description: Master service extra specification
                   properties:
+                    allowedSourceRanges:
+                      description: AllowedSourceRanges sets a list of CIDR blocks allowed to access the cluster using LoadBalancer service.
+                      items:
+                        type: string
+                      type: array
                     annotations:
                       additionalProperties:
                         type: string
@@ -3774,6 +3779,11 @@ spec:
                 replicaServiceSpec:
                   description: Healthy replica service extra specification
                   properties:
+                    allowedSourceRanges:
+                      description: AllowedSourceRanges sets a list of CIDR blocks allowed to access the cluster using LoadBalancer service.
+                      items:
+                        type: string
+                      type: array
                     annotations:
                       additionalProperties:
                         type: string

diff --git a/pkg/apis/mysql/v1alpha1/mysqlcluster_types.go b/pkg/apis/mysql/v1alpha1/mysqlcluster_types.go
@@ -255,6 +255,10 @@ type ServiceSpec struct {
 	// +optional
 	LoadBalancer bool `json:"loadBalancer,omitempty"`
 
+	// AllowedSourceRanges sets a list of CIDR blocks allowed to access the cluster using LoadBalancer service.
+	// +optional
+	AllowedSourceRanges []string `json:"allowedSourceRanges,omitempty"`
+
 	// Annotations allow to specify annotations for MysqlCluster's services
 	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`

diff --git a/pkg/apis/mysql/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/mysql/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controller/mysqlcluster/internal/syncer/healthy_replicas_service.go b/pkg/controller/mysqlcluster/internal/syncer/healthy_replicas_service.go
@@ -40,6 +40,7 @@ func NewHealthyReplicasSVCSyncer(c client.Client, scheme *runtime.Scheme, cluste
 		// set service type
 		if cluster.Spec.ReplicaServiceSpec.LoadBalancer {
 			service.Spec.Type = core.ServiceTypeLoadBalancer
+			service.Spec.LoadBalancerSourceRanges = cluster.Spec.ReplicaServiceSpec.AllowedSourceRanges
 		}
 
 		// merge annotations

diff --git a/pkg/controller/mysqlcluster/internal/syncer/master_service.go b/pkg/controller/mysqlcluster/internal/syncer/master_service.go
@@ -40,6 +40,7 @@ func NewMasterSVCSyncer(c client.Client, scheme *runtime.Scheme, cluster *mysqlc
 		// set service type
 		if cluster.Spec.MasterServiceSpec.LoadBalancer {
 			service.Spec.Type = core.ServiceTypeLoadBalancer
+			service.Spec.LoadBalancerSourceRanges = cluster.Spec.MasterServiceSpec.AllowedSourceRanges
 		}
 
 		// merge annotations