support mysqlNodePort and statusNodePort (#2941) (#2986)

* cherry pick #2941 to release-1.1 Signed-off-by: ti-srebot <[email protected]> * regenerate code Co-authored-by: Chunzhu Li <[email protected]>
pingcap · Jul 17, 2020 · 762fa76 · 762fa76
1 parent 4b4963f
commit 762fa76
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 0 deletions.
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -9888,6 +9888,32 @@ bool
 Optional: Defaults to true</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>mysqlNodePort</code></br>
+<em>
+int
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Expose the tidb cluster mysql port to MySQLNodePort
+Optional: Defaults to 0</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>statusNodePort</code></br>
+<em>
+int
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Expose the tidb status node port to StatusNodePort
+Optional: Defaults to 0</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="tidbslowlogtailerspec">TiDBSlowLogTailerSpec</h3>

diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml
@@ -110,9 +110,12 @@ spec:
     ## Service defines a Kubernetes service of TiDB cluster.
     ## If you are in a public cloud environment, you can use cloud LB to access the TiDB service
     ## if you are in a private cloud environment, you can use ingress
+    ## you can set mysqlNodePort and statusNodePort to expose server/status service to given NodePort
     # service:
     #   externalTrafficPolicy: Local
     #   type: LoadBalancer
+    #   mysqlNodePort: 30020
+    #   statusNodePort: 30040
 
     ## Affinity for pod assignment
     ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity

diff --git a/manifests/crd.yaml b/manifests/crd.yaml
@@ -7040,6 +7040,12 @@ spec:
                       type: boolean
                     externalTrafficPolicy:
                       type: string
+                    mysqlNodePort:
+                      format: int32
+                      type: integer
+                    statusNodePort:
+                      format: int32
+                      type: integer
                   type: object
                 slowLogTailer:
                   properties:

diff --git a/pkg/apis/pingcap/v1alpha1/openapi_generated.go b/pkg/apis/pingcap/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/pingcap/v1alpha1/tidbcluster.go b/pkg/apis/pingcap/v1alpha1/tidbcluster.go
@@ -551,6 +551,22 @@ func (tidbSvc *TiDBServiceSpec) ShouldExposeStatus() bool {
 	return *exposeStatus
 }
 
+func (tidbSvc *TiDBServiceSpec) GetMySQLNodePort() int32 {
+	mysqlNodePort := tidbSvc.MySQLNodePort
+	if mysqlNodePort == nil {
+		return 0
+	}
+	return int32(*mysqlNodePort)
+}
+
+func (tidbSvc *TiDBServiceSpec) GetStatusNodePort() int32 {
+	statusNodePort := tidbSvc.StatusNodePort
+	if statusNodePort == nil {
+		return 0
+	}
+	return int32(*statusNodePort)
+}
+
 func (tc *TidbCluster) GetInstanceName() string {
 	labels := tc.ObjectMeta.GetLabels()
 	// Keep backward compatibility for helm.

diff --git a/pkg/apis/pingcap/v1alpha1/types.go b/pkg/apis/pingcap/v1alpha1/types.go
@@ -768,6 +768,16 @@ type TiDBServiceSpec struct {
 	// Optional: Defaults to true
 	// +optional
 	ExposeStatus *bool `json:"exposeStatus,omitempty"`
+
+	// Expose the tidb cluster mysql port to MySQLNodePort
+	// Optional: Defaults to 0
+	// +optional
+	MySQLNodePort *int `json:"mysqlNodePort,omitempty"`
+
+	// Expose the tidb status node port to StatusNodePort
+	// Optional: Defaults to 0
+	// +optional
+	StatusNodePort *int `json:"statusNodePort,omitempty"`
 }
 
 // +k8s:openapi-gen=false

diff --git a/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/pingcap/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/manager/member/tidb_member_manager.go b/pkg/manager/member/tidb_member_manager.go
@@ -449,6 +449,7 @@ func getNewTiDBServiceOrNil(tc *v1alpha1.TidbCluster) *corev1.Service {
 			Port:       4000,
 			TargetPort: intstr.FromInt(4000),
 			Protocol:   corev1.ProtocolTCP,
+			NodePort:   svcSpec.GetMySQLNodePort(),
 		},
 	}
 	if svcSpec.ShouldExposeStatus() {
@@ -457,6 +458,7 @@ func getNewTiDBServiceOrNil(tc *v1alpha1.TidbCluster) *corev1.Service {
 			Port:       10080,
 			TargetPort: intstr.FromInt(10080),
 			Protocol:   corev1.ProtocolTCP,
+			NodePort:   svcSpec.GetStatusNodePort(),
 		})
 	}
 

diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -239,6 +239,9 @@ func RetainManagedFields(desiredSvc, existedSvc *corev1.Service) {
 	}
 	// Retain NodePorts
 	for id, dport := range desiredSvc.Spec.Ports {
+		if dport.NodePort != 0 {
+			continue
+		}
 		for _, eport := range existedSvc.Spec.Ports {
 			if dport.Port == eport.Port && dport.Protocol == eport.Protocol {
 				dport.NodePort = eport.NodePort