Merge branch 'master' into master

charts/tidb-cluster/templates/_helpers.tpl

@@ -152,17 +152,3 @@ drainer-config: |-
 {{- define "drainer-configmap.data-digest" -}}
 {{ include "drainer-configmap.data" . | sha256sum | trunc 8 }}
 {{- end -}}
-
-{{/*
-Encapsulate tikv-importer configmap data for consistent digest calculation
-*/}}
-{{- define "importer-configmap.data" -}}
-config-file: |-
-    {{- if .Values.importer.config }}
-{{ .Values.importer.config | indent 2 }}
-    {{- end -}}
-{{- end -}}
-
-{{- define "importer-configmap.data-digest" -}}
-{{ include "importer-configmap.data" . | sha256sum | trunc 8 }}
-{{- end -}}

charts/tidb-cluster/values.yaml

@@ -838,30 +838,6 @@ scheduledBackup:
   ## refer to https://kubernetes.io/docs/concepts/configuration/taint-and-toleration
   tolerations: []
 
-importer:
-  create: false
-  image: pingcap/tidb-lightning:v7.1.1
-  imagePullPolicy: IfNotPresent
-  storageClassName: local-storage
-  storage: 200Gi
-  resources: {}
-    # limits:
-    #   cpu: 16000m
-    #   memory: 8Gi
-    # requests:
-    #   cpu: 16000m
-    #   memory: 8Gi
-  affinity: {}
-  tolerations: []
-  pushgatewayImage: prom/pushgateway:v0.3.1
-  pushgatewayImagePullPolicy: IfNotPresent
-  config: |
-    log-level = "info"
-    [metric]
-    job = "tikv-importer"
-    interval = "15s"
-    address = "localhost:9091"
-
 metaInstance: "{{ $labels.instance }}"
 metaType: "{{ $labels.type }}"
 metaValue: "{{ $value }}"

charts/tidb-lightning/templates/scripts/_start_lightning.sh.tpl

@@ -29,9 +29,7 @@ sed "s#CHECKPOINT_USE_DATA_DIR#$data_dir#g" /etc/tidb-lightning/tidb-lightning.t
 /tidb-lightning \
     --pd-urls={{ .Values.targetTidbCluster.name }}-pd.{{ .Values.targetTidbCluster.namespace | default .Release.Namespace }}:{{ .Values.targetTidbCluster.pdClientPort | default 2379 }} \
     --status-addr=0.0.0.0:8289 \
-{{- if eq .Values.backend "importer" }}
-    --importer={{ .Values.targetTidbCluster.name }}-importer.{{ .Values.targetTidbCluster.namespace | default .Release.Namespace }}:8287 \
-{{- else if eq .Values.backend "tidb" }}
+{{- if eq .Values.backend "tidb" }}
     --backend=tidb \
     --tidb-port={{ .Values.targetTidbCluster.port | default 4000 }} \
 {{- else if eq .Values.backend "local" }}

charts/tidb-lightning/values.yaml

@@ -97,7 +97,7 @@ annotations: {}
 tolerations: []
 affinity: {}
 
-# The delivery backend used to import data (valid options include `local`, `tidb` and `importer`(deprecated)).
+# The delivery backend used to import data (valid options include `local` and `tidb`.
 # If set to `local`, then the following `sortedKV` should be set.
 backend: local