UCP: support setting discovery resources (#2434) (#2603)

pingcap · Jun 2, 2020 · eea12d5 · eea12d5
1 parent f50e93d
commit eea12d5
Show file tree

Hide file tree

Showing 9 changed files with 208 additions and 16 deletions.
diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -705,6 +705,19 @@ TidbClusterSpec
 <table>
 <tr>
 <td>
+<code>discovery</code></br>
+<em>
+<a href="#discoveryspec">
+DiscoverySpec
+</a>
+</em>
+</td>
+<td>
+<p>Discovery spec</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>pd</code></br>
 <em>
 <a href="#pdspec">
@@ -3256,6 +3269,39 @@ string
 </tr>
 </tbody>
 </table>
+<h3 id="discoveryspec">DiscoverySpec</h3>
+<p>
+(<em>Appears on:</em>
+<a href="#tidbclusterspec">TidbClusterSpec</a>)
+</p>
+<p>
+<p>DiscoverySpec contains details of Discovery members</p>
+</p>
+<table>
+<thead>
+<tr>
+<th>Field</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>
+<code>ResourceRequirements</code></br>
+<em>
+<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.13/#resourcerequirements-v1-core">
+Kubernetes core/v1.ResourceRequirements
+</a>
+</em>
+</td>
+<td>
+<p>
+(Members of <code>ResourceRequirements</code> are embedded into this type.)
+</p>
+</td>
+</tr>
+</tbody>
+</table>
 <h3 id="experimental">Experimental</h3>
 <p>
 (<em>Appears on:</em>
@@ -14582,6 +14628,19 @@ string
 <tbody>
 <tr>
 <td>
+<code>discovery</code></br>
+<em>
+<a href="#discoveryspec">
+DiscoverySpec
+</a>
+</em>
+</td>
+<td>
+<p>Discovery spec</p>
+</td>
+</tr>
+<tr>
+<td>
 <code>pd</code></br>
 <em>
 <a href="#pdspec">

diff --git a/examples/basic/tidb-cluster.yaml b/examples/basic/tidb-cluster.yaml
@@ -6,6 +6,13 @@ spec:
   version: v3.0.13
   timezone: UTC
   pvReclaimPolicy: Delete
+  discovery:
+    limits:
+      cpu: 250m
+      memory: 150Mi
+    requests:
+      cpu: 80m
+      memory: 50Mi
   pd:
     baseImage: pingcap/pd
     replicas: 3

diff --git a/manifests/crd.yaml b/manifests/crd.yaml
@@ -334,6 +334,13 @@ spec:
               type: object
             configUpdateStrategy:
               type: string
+            discovery:
+              properties:
+                limits:
+                  type: object
+                requests:
+                  type: object
+              type: object
             enablePVReclaim:
               type: boolean
             helper:

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/types.go b/pkg/apis/pingcap/v1alpha1/types.go
@@ -107,6 +107,9 @@ type TidbClusterList struct {
 // +k8s:openapi-gen=true
 // TidbClusterSpec describes the attributes that a user creates on a tidb cluster
 type TidbClusterSpec struct {
+	// Discovery spec
+	Discovery DiscoverySpec `json:"discovery,omitempty"`
+
 	// PD cluster spec
 	PD PDSpec `json:"pd"`
 
@@ -258,6 +261,12 @@ const (
 	TidbClusterReady TidbClusterConditionType = "Ready"
 )
 
+// +k8s:openapi-gen=true
+// DiscoverySpec contains details of Discovery members
+type DiscoverySpec struct {
+	corev1.ResourceRequirements `json:",inline"`
+}
+
 // +k8s:openapi-gen=true
 // PDSpec contains details of PD members
 type PDSpec struct {

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_discovery_manager.go b/pkg/manager/member/tidb_discovery_manager.go
@@ -130,7 +130,8 @@ func getTidbDiscoveryDeployment(tc *v1alpha1.TidbCluster) (*appsv1.Deployment, e
 				Spec: corev1.PodSpec{
 					ServiceAccountName: meta.Name,
 					Containers: []corev1.Container{{
-						Name: "discovery",
+						Name:      "discovery",
+						Resources: controller.ContainerResource(tc.Spec.Discovery.ResourceRequirements),
 						Command: []string{
 							"/usr/local/bin/tidb-discovery",
 						},

diff --git a/pkg/manager/member/tidb_discovery_manager_test.go b/pkg/manager/member/tidb_discovery_manager_test.go
@@ -22,6 +22,8 @@ import (
 	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
 	"github.com/pingcap/tidb-operator/pkg/controller"
 	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 )
 
 func TestTidbDiscoveryManager_Reconcile(t *testing.T) {
@@ -59,6 +61,41 @@ func TestTidbDiscoveryManager_Reconcile(t *testing.T) {
 			},
 			errOnCreateOrUpdate: false,
 		},
+		{
+			name: "Setting discovery resource",
+			prepare: func(tc *v1alpha1.TidbCluster, ctrl *controller.FakeGenericControl) {
+				tc.Spec.Discovery.ResourceRequirements = corev1.ResourceRequirements{
+					Requests: corev1.ResourceList{
+						corev1.ResourceCPU:              resource.MustParse("1"),
+						corev1.ResourceMemory:           resource.MustParse("2Gi"),
+						corev1.ResourceEphemeralStorage: resource.MustParse("10Gi"),
+					},
+					Limits: corev1.ResourceList{
+						corev1.ResourceCPU:              resource.MustParse("1"),
+						corev1.ResourceMemory:           resource.MustParse("2Gi"),
+						corev1.ResourceEphemeralStorage: resource.MustParse("10Gi"),
+					},
+				}
+			},
+			expect: func(deploys []appsv1.Deployment, tc *v1alpha1.TidbCluster, err error) {
+				g.Expect(err).To(Succeed())
+				g.Expect(deploys).To(HaveLen(1))
+				g.Expect(deploys[0].Spec.Template.Spec.Containers[0].Resources).To(Equal(corev1.ResourceRequirements{
+					Requests: corev1.ResourceList{
+						corev1.ResourceCPU:              resource.MustParse("1"),
+						corev1.ResourceMemory:           resource.MustParse("2Gi"),
+						corev1.ResourceEphemeralStorage: resource.MustParse("10Gi"),
+					},
+					Limits: corev1.ResourceList{
+						corev1.ResourceCPU:              resource.MustParse("1"),
+						corev1.ResourceMemory:           resource.MustParse("2Gi"),
+						corev1.ResourceEphemeralStorage: resource.MustParse("10Gi"),
+					},
+				}))
+				g.Expect(deploys[0].Name).To((Equal("test-discovery")))
+			},
+			errOnCreateOrUpdate: false,
+		},
 		{
 			name: "Create or update resource error",
 			expect: func(deploys []appsv1.Deployment, tc *v1alpha1.TidbCluster, err error) {

diff --git a/tests/e2e/tidbcluster/tidbcluster.go b/tests/e2e/tidbcluster/tidbcluster.go
@@ -1265,20 +1265,24 @@ func newTidbClusterConfig(cfg *tests.Config, ns, clusterName, password, tidbVers
 		BackupSecretName: fmt.Sprintf("%s-backup-secret", clusterName),
 		BackupName:       "backup",
 		Resources: map[string]string{
-			"pd.resources.limits.cpu":        "1000m",
-			"pd.resources.limits.memory":     "2Gi",
-			"pd.resources.requests.cpu":      "20m",
-			"pd.resources.requests.memory":   "20Mi",
-			"tikv.resources.limits.cpu":      "2000m",
-			"tikv.resources.limits.memory":   "4Gi",
-			"tikv.resources.requests.cpu":    "20m",
-			"tikv.resources.requests.memory": "20Mi",
-			"tidb.resources.limits.cpu":      "2000m",
-			"tidb.resources.limits.memory":   "4Gi",
-			"tidb.resources.requests.cpu":    "20m",
-			"tidb.resources.requests.memory": "20Mi",
-			"tidb.initSql":                   strconv.Quote("create database e2e;"),
-			"discovery.image":                cfg.OperatorImage,
+			"discovery.resources.limits.cpu":      "1000m",
+			"discovery.resources.limits.memory":   "2Gi",
+			"discovery.resources.requests.cpu":    "20m",
+			"discovery.resources.requests.memory": "20Mi",
+			"pd.resources.limits.cpu":             "1000m",
+			"pd.resources.limits.memory":          "2Gi",
+			"pd.resources.requests.cpu":           "20m",
+			"pd.resources.requests.memory":        "20Mi",
+			"tikv.resources.limits.cpu":           "2000m",
+			"tikv.resources.limits.memory":        "4Gi",
+			"tikv.resources.requests.cpu":         "20m",
+			"tikv.resources.requests.memory":      "20Mi",
+			"tidb.resources.limits.cpu":           "2000m",
+			"tidb.resources.limits.memory":        "4Gi",
+			"tidb.resources.requests.cpu":         "20m",
+			"tidb.resources.requests.memory":      "20Mi",
+			"tidb.initSql":                        strconv.Quote("create database e2e;"),
+			"discovery.image":                     cfg.OperatorImage,
 		},
 		Args:    map[string]string{},
 		Monitor: true,