Merge pull request radondb#252 from runkecheng/dmp_svc

*: Support extranet access service. radondb#251
zhl003 · Oct 11, 2021 · 934c703 · 934c703
2 parents d986ca7 + 101a305
commit 934c703
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/cluster/syncer/follower_service.go b/cluster/syncer/follower_service.go
@@ -29,6 +29,8 @@ import (
 
 // NewFollowerSVCSyncer returns follower service syncer.
 func NewFollowerSVCSyncer(cli client.Client, c *cluster.Cluster) syncer.Interface {
+	labels := c.GetLabels()
+	labels["mysql.radondb.com/service-type"] = string(utils.FollowerService)
 	service := &corev1.Service{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "v1",
@@ -37,11 +39,14 @@ func NewFollowerSVCSyncer(cli client.Client, c *cluster.Cluster) syncer.Interfac
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      c.GetNameForResource(utils.FollowerService),
 			Namespace: c.Namespace,
-			Labels:    c.GetLabels(),
+			Labels:    labels,
 		},
 	}
 	return syncer.NewObjectSyncer("FollowerSVC", c.Unwrap(), service, cli, func() error {
-		service.Spec.Type = "ClusterIP"
+		// Allows to modify the service access method, the default is ClusterIP.
+		if service.Spec.Type == "" {
+			service.Spec.Type = "ClusterIP"
+		}
 		service.Spec.Selector = c.GetSelectorLabels()
 		service.Spec.Selector["role"] = "follower"
 		service.Spec.Selector["healthy"] = "yes"

diff --git a/cluster/syncer/leader_service.go b/cluster/syncer/leader_service.go
@@ -29,6 +29,8 @@ import (
 
 // NewLeaderSVCSyncer returns leader service syncer.
 func NewLeaderSVCSyncer(cli client.Client, c *cluster.Cluster) syncer.Interface {
+	labels := c.GetLabels()
+	labels["mysql.radondb.com/service-type"] = string(utils.LeaderService)
 	service := &corev1.Service{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "v1",
@@ -37,11 +39,14 @@ func NewLeaderSVCSyncer(cli client.Client, c *cluster.Cluster) syncer.Interface
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      c.GetNameForResource(utils.LeaderService),
 			Namespace: c.Namespace,
-			Labels:    c.GetLabels(),
+			Labels:    labels,
 		},
 	}
 	return syncer.NewObjectSyncer("LeaderSVC", c.Unwrap(), service, cli, func() error {
-		service.Spec.Type = "ClusterIP"
+		// Allows to modify the service access method, the default is ClusterIP.
+		if service.Spec.Type == "" {
+			service.Spec.Type = "ClusterIP"
+		}
 		service.Spec.Selector = c.GetSelectorLabels()
 		service.Spec.Selector["role"] = "leader"
 

diff --git a/cluster/syncer/metrics_service.go b/cluster/syncer/metrics_service.go
@@ -29,6 +29,8 @@ import (
 
 // NewMetricsSVCSyncer returns metrics service syncer.
 func NewMetricsSVCSyncer(cli client.Client, c *cluster.Cluster) syncer.Interface {
+	labels := c.GetLabels()
+	labels["mysql.radondb.com/service-type"] = string(utils.MetricsService)
 	service := &corev1.Service{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "v1",
@@ -37,11 +39,14 @@ func NewMetricsSVCSyncer(cli client.Client, c *cluster.Cluster) syncer.Interface
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      c.GetNameForResource(utils.MetricsService),
 			Namespace: c.Namespace,
-			Labels:    c.GetLabels(),
+			Labels:    labels,
 		},
 	}
 	return syncer.NewObjectSyncer("MetricsSVC", c.Unwrap(), service, cli, func() error {
-		service.Spec.Type = "ClusterIP"
+		// Allows to modify the service access method, the default is ClusterIP.
+		if service.Spec.Type == "" {
+			service.Spec.Type = "ClusterIP"
+		}
 		service.Spec.Selector = c.GetSelectorLabels()
 
 		if len(service.Spec.Ports) != 1 {