Support loadBalancerSourceRanges configuration for master/replica ser…

…vices
bitpoke · Nov 9, 2021 · 1b16804 · 1b16804
1 parent 32164d0
commit 1b16804
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 28 deletions.
diff --git a/config/crd/bases/mysql.presslabs.org_mysqlclusters.yaml b/config/crd/bases/mysql.presslabs.org_mysqlclusters.yaml
@@ -51,20 +51,6 @@ spec:
             description: 'MysqlClusterSpec defines the desired state of MysqlCluster
               nolint: maligned'
             properties:
-              MasterServiceSpec:
-                description: Master service extra specification
-                properties:
-                  annotations:
-                    additionalProperties:
-                      type: string
-                    description: Annotations allow to specify annotations for MysqlCluster's
-                      services
-                    type: object
-                  loadBalancer:
-                    description: LoadBalancer configures whether a service is a LoadBalancer
-                      or not.
-                    type: boolean
-                type: object
               backupCompressCommand:
                 description: BackupCompressCommand is a command to use for compressing
                   the backup.
@@ -116,6 +102,26 @@ spec:
                 items:
                   type: string
                 type: array
+              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
+                    description: Annotations allow to specify annotations for MysqlCluster's
+                      services
+                    type: object
+                  loadBalancer:
+                    description: LoadBalancer configures whether a service is a LoadBalancer
+                      or not.
+                    type: boolean
+                type: object
               maxSlaveLatency:
                 description: MaxSlaveLatency represents the allowed latency for a
                   slave node in seconds. If set then the node with a latency grater
@@ -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
@@ -46,18 +46,6 @@ spec:
             spec:
               description: 'MysqlClusterSpec defines the desired state of MysqlCluster nolint: maligned'
               properties:
-                MasterServiceSpec:
-                  description: Master service extra specification
-                  properties:
-                    annotations:
-                      additionalProperties:
-                        type: string
-                      description: Annotations allow to specify annotations for MysqlCluster's services
-                      type: object
-                    loadBalancer:
-                      description: LoadBalancer configures whether a service is a LoadBalancer or not.
-                      type: boolean
-                  type: object
                 backupCompressCommand:
                   description: BackupCompressCommand is a command to use for compressing the backup.
                   items:
@@ -99,6 +87,23 @@ spec:
                   items:
                     type: string
                   type: array
+                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
+                      description: Annotations allow to specify annotations for MysqlCluster's services
+                      type: object
+                    loadBalancer:
+                      description: LoadBalancer configures whether a service is a LoadBalancer or not.
+                      type: boolean
+                  type: object
                 maxSlaveLatency:
                   description: MaxSlaveLatency represents the allowed latency for a slave node in seconds. If set then the node with a latency grater than this is removed from service.
                   format: int64
@@ -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
@@ -109,7 +109,7 @@ type MysqlClusterSpec struct {
 
 	// Master service extra specification
 	// +optional
-	MasterServiceSpec ServiceSpec `json:"MasterServiceSpec,omitempty"`
+	MasterServiceSpec ServiceSpec `json:"masterServiceSpec,omitempty"`
 
 	// Healthy replica service extra specification
 	// +optional
@@ -249,12 +249,16 @@ type VolumeSpec struct {
 	PersistentVolumeClaim *core.PersistentVolumeClaimSpec `json:"persistentVolumeClaim,omitempty"`
 }
 
-// ServiceSpec s the desired spec for addition configuration of MysqlCluster services
+// ServiceSpec is the desired spec for addition configuration of MysqlCluster services
 type ServiceSpec struct {
 	// LoadBalancer configures whether a service is a LoadBalancer or not.
 	// +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