diff --git a/charts/canal-admin/templates/ingress.yaml b/charts/canal-admin/templates/ingress.yaml index 8852915512..68b13fac03 100644 --- a/charts/canal-admin/templates/ingress.yaml +++ b/charts/canal-admin/templates/ingress.yaml @@ -1,5 +1,9 @@ {{- if .Values.ingress.enabled -}} +{{- if semverCompare ">=1.19.0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1 +{{- else -}} +apiVersion: networking.k8s.io/v1beta1 +{{- end }} kind: Ingress metadata: name: {{ include "canal-admin.fullname" . }} @@ -24,6 +28,7 @@ spec: {{- end }} {{- end }} rules: + {{- if semverCompare ">=1.19.0" .Capabilities.KubeVersion.GitVersion -}} {{- range .Values.ingress.hosts }} - host: {{ .host | quote }} http: @@ -40,4 +45,20 @@ spec: number: {{ $.Values.service.port }} {{- end }} {{- end }} + {{- else -}} + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- with .pathType }} + pathType: {{ . }} + {{- end }} + backend: + serviceName: {{ include "canal-admin.fullname" $ }} + servicePort: {{ $.Values.service.port }} + {{- end }} + {{- end }} + {{- end }} {{- end }} diff --git a/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java index f9f7844e91..80a57c4a74 100644 --- a/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java +++ b/client-adapter/escore/src/main/java/com/alibaba/otter/canal/client/adapter/es/core/ESAdapter.java @@ -145,6 +145,7 @@ private void addSyncConfigToCache(String configName, ESSyncConfig config) { schemaItem.getAliasTableItems().values().forEach(tableItem -> { Map esSyncConfigMap; String schemaKey = tableItem.getSchema() == null ? schema : tableItem.getSchema(); + schemaKey = StringUtils.trimToEmpty(schemaKey).replaceAll("[`']", ""); if (envProperties != null && !"tcp".equalsIgnoreCase(envProperties.getProperty("canal.conf.mode"))) { esSyncConfigMap = dbTableEsSyncConfig .computeIfAbsent(StringUtils.trimToEmpty(config.getDestination()) + "-"