Skip to content

Commit

Permalink
*: remove tikv-importer (pingcap#5391)
Browse files Browse the repository at this point in the history
  • Loading branch information
csuzhangxc authored Nov 16, 2023
1 parent 3a70782 commit 996c48f
Show file tree
Hide file tree
Showing 17 changed files with 4 additions and 645 deletions.
14 changes: 0 additions & 14 deletions charts/tidb-cluster/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
15 changes: 0 additions & 15 deletions charts/tidb-cluster/templates/tikv-importer-configmap.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions charts/tidb-cluster/templates/tikv-importer-service.yaml

This file was deleted.

94 changes: 0 additions & 94 deletions charts/tidb-cluster/templates/tikv-importer-statefulset.yaml

This file was deleted.

24 changes: 0 additions & 24 deletions charts/tidb-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}
Expand Down
2 changes: 1 addition & 1 deletion charts/tidb-lightning/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
21 changes: 0 additions & 21 deletions charts/tikv-importer/.helmignore

This file was deleted.

13 changes: 0 additions & 13 deletions charts/tikv-importer/Chart.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions charts/tikv-importer/templates/_helpers.tpl

This file was deleted.

13 changes: 0 additions & 13 deletions charts/tikv-importer/templates/tikv-importer-configmap.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions charts/tikv-importer/templates/tikv-importer-service.yaml

This file was deleted.

Loading

0 comments on commit 996c48f

Please sign in to comment.