This is an automated email from the ASF dual-hosted git repository. healchow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/inlong.git
commit 6643428770ff8634b4c94d8b93b0b757e12d930e Author: lucaspeng12138 <[email protected]> AuthorDate: Fri Jul 1 15:28:55 2022 +0800 [INLONG-4827][Kubernets] Add Flink config into the YAML files (#4828) --- docker/docker-compose/docker-compose.yml | 2 ++ docker/kubernetes/templates/manager-statefulset.yaml | 4 ++++ docker/kubernetes/values.yaml | 4 ++++ inlong-manager/manager-docker/manager-docker.sh | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/docker/docker-compose/docker-compose.yml b/docker/docker-compose/docker-compose.yml index fbcdd822d..3706e65a8 100644 --- a/docker/docker-compose/docker-compose.yml +++ b/docker/docker-compose/docker-compose.yml @@ -55,6 +55,8 @@ services: - USERNAME=root - PASSWORD=inlong - ZK_URL=tubemq-server:2181 + - FLINK_HOST=localhost + - FLINK_PORT=8081 webisite: image: inlong/dashboard diff --git a/docker/kubernetes/templates/manager-statefulset.yaml b/docker/kubernetes/templates/manager-statefulset.yaml index 39fd41415..0369297a6 100644 --- a/docker/kubernetes/templates/manager-statefulset.yaml +++ b/docker/kubernetes/templates/manager-statefulset.yaml @@ -95,6 +95,10 @@ spec: key: mysql-password - name: ZK_URL value: "{{ template "inlong.zookeeper.hostname" . }}:{{ .Values.zookeeper.ports.client }}" + - name: FLINK_HOST + value: {{ .Values.external.flink.hostname | quote }} + - name: FLINK_PORT + value: {{ .Values.external.flink.port | quote }} {{- range $key, $value := .Values.manager.env }} - name: {{ $key }} value: {{ $value | quote }} diff --git a/docker/kubernetes/values.yaml b/docker/kubernetes/values.yaml index 7e67773f1..1e69487a0 100644 --- a/docker/kubernetes/values.yaml +++ b/docker/kubernetes/values.yaml @@ -645,3 +645,7 @@ external: enabled: false serviceUrl: "localhost:6650" adminUrl: "localhost:8080" + flink: + enabled: true + hostname: "127.0.0.1" + port: 8081 diff --git a/inlong-manager/manager-docker/manager-docker.sh b/inlong-manager/manager-docker/manager-docker.sh index 0fc74215a..a61a61405 100644 --- a/inlong-manager/manager-docker/manager-docker.sh +++ b/inlong-manager/manager-docker/manager-docker.sh @@ -26,6 +26,7 @@ if [ -f "${ACTIVE_PROFILE}" ]; then fi conf_file="${file_path}"/conf/application-"${ACTIVE_PROFILE}".properties +flink_conf_file="${file_path}"/plugins/flink-sort-plugin.properties # replace the configuration sed -i "s/spring.profiles.active=.*$/spring.profiles.active=${ACTIVE_PROFILE}/g" "${file_path}"/conf/application.properties @@ -33,6 +34,9 @@ sed -i "s/127.0.0.1:3306/${JDBC_URL}/g" "${conf_file}" sed -i "s/datasource.druid.username=.*$/datasource.druid.username=${USERNAME}/g" "${conf_file}" sed -i "s/datasource.druid.password=.*$/datasource.druid.password=${PASSWORD}/g" "${conf_file}" +sed -i "s/flink.rest.address=.*$/flink.rest.address=${FLINK_HOST}/g" "${flink_conf_file}" +sed -i "s/flink.rest.port=.*$/flink.rest.port=${FLINK_PORT}/g" "${flink_conf_file}" + # startup the application JAVA_OPTS="-Dspring.profiles.active=${ACTIVE_PROFILE}"
