This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch dev-1.3.1 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 69ff2d80f2e853ee036970f03dfd1cd3ca6f6179 Merge: 732209cc4 8706bdf37 Author: peacewong <[email protected]> AuthorDate: Thu Oct 20 11:25:01 2022 +0800 Merge mater into dev-1.3.1 Merge mater into dev-1.3.1 .asf.yaml | 8 +- .github/workflows/publish-docker.yaml | 16 +- .github/workflows/publish-snapshot.yml | 10 +- README.md | 53 ++- README_CN.md | 78 ++-- docs/configuration-change-records.md | 7 + docs/configuration/accessible-executor.md | 14 +- docs/configuration/elasticsearch.md | 9 +- docs/configuration/executor-core.md | 10 +- docs/configuration/flink.md | 5 +- docs/configuration/linkis-application-manager.md | 10 +- docs/configuration/linkis-bml-server.md | 7 +- docs/configuration/linkis-common.md | 6 +- .../configuration/linkis-computation-engineconn.md | 11 +- .../linkis-computation-governance-common.md | 10 +- .../linkis-computation-orchestrator.md | 7 +- docs/configuration/linkis-configuration.md | 8 +- docs/configuration/linkis-engineconn-common.md | 10 +- .../linkis-engineconn-manager-server.md | 12 +- .../configuration/linkis-engineconn-plugin-core.md | 5 +- .../linkis-engineconn-plugin-server.md | 7 +- docs/configuration/linkis-entrance.md | 14 +- docs/configuration/linkis-gateway-core.md | 11 +- docs/configuration/linkis-hadoop-common.md | 7 +- docs/configuration/linkis-httpclient.md | 5 +- docs/configuration/linkis-io-file-client.md | 7 +- docs/configuration/linkis-jobhistory.md | 5 +- docs/configuration/linkis-manager-common.md | 9 +- docs/configuration/linkis-metadata.md | 9 +- docs/configuration/linkis-module.md | 5 +- docs/configuration/linkis-orchestrator-core.md | 5 +- docs/configuration/linkis-protocol.md | 5 +- docs/configuration/linkis-rpc.md | 5 +- docs/configuration/linkis-scheduler.md | 5 +- docs/configuration/linkis-storage.md | 7 +- docs/configuration/linkis-udf.md | 5 +- docs/configuration/pipeline.md | 7 +- docs/configuration/presto.md | 7 +- docs/configuration/python.md | 5 +- docs/configuration/spark.md | 5 +- docs/configuration/sqoop.md | 7 +- docs/index.md | 2 + .../org/apache/linkis/rpc/AsynRPCMessageBus.scala | 4 +- .../apache/linkis/rpc/conf/RPCConfiguration.scala | 2 +- linkis-commons/linkis-storage/pom.xml | 14 +- .../impl/BmlResourceLocalizationService.scala | 22 +- .../ecm/server/spring/ECMSpringConfiguration.scala | 6 + ...vice.java => EnginePluginAdminServiceImpl.java} | 13 +- .../impl/DefaultNodeMetricManagerPersistence.java | 7 +- linkis-dist/bin/checkEnv.sh | 2 +- linkis-dist/bin/install-linkis-to-kubernetes.sh | 215 +++++++++ linkis-dist/bin/install.sh | 2 +- linkis-dist/deploy-config/linkis-env.sh | 5 +- linkis-dist/docker/ldh.Dockerfile | 20 +- .../licenses/LICENSE-apache-hive-2.3.3-bin.txt | 407 ++++++++++++++++ .../LICENSE-apache-zookeeper-3.5.9-bin.txt | 202 ++++++++ .../docker/licenses/LICENSE-flink-1.12.2.txt | 201 ++++++++ .../docker/licenses/LICENSE-hadoop-2.7.2.txt | 289 ++++++++++++ .../licenses/LICENSE-spark-2.4.3-bin-hadoop2.7.txt | 517 +++++++++++++++++++++ .../linkis-with-mysql-jdbc.Dockerfile} | 27 +- linkis-dist/docker/linkis.Dockerfile | 64 +-- linkis-dist/docker/scripts/entry-point-ldh.sh | 14 +- .../scripts/make-linikis-image-with-mysql-jdbc.sh | 51 ++ linkis-dist/docker/scripts/prepare-ldh-image.sh | 33 +- .../login-pod.sh => docker/scripts/utils.sh} | 32 +- linkis-dist/helm/README.md | 2 +- linkis-dist/helm/{README.md => README_CN.md} | 137 +++--- linkis-dist/helm/charts/linkis/Chart.yaml | 2 +- .../linkis/templates/configmap-init-sql.yaml | 2 +- .../linkis/templates/configmap-linkis-config.yaml | 92 ++-- .../templates/linkis-cg-engineconnmanager.yaml | 97 +++- .../linkis/templates/linkis-cg-engineplugin.yaml | 41 +- .../linkis/templates/linkis-cg-entrance.yaml | 23 +- .../linkis/templates/linkis-cg-linkismanager.yaml | 8 +- .../charts/linkis/templates/linkis-mg-eureka.yaml | 8 +- .../charts/linkis/templates/linkis-mg-gateway.yaml | 8 +- .../helm/charts/linkis/templates/linkis-ps-cs.yaml | 184 -------- .../templates/linkis-ps-data-source-manager.yaml | 184 -------- .../linkis/templates/linkis-ps-metadataquery.yaml | 187 -------- .../linkis/templates/linkis-ps-publicservice.yaml | 32 +- linkis-dist/helm/charts/linkis/values.yaml | 66 +-- linkis-dist/helm/scripts/create-kind-cluster.sh | 8 +- .../{login-pod.sh => install-charts-with-ldh.sh} | 17 +- linkis-dist/helm/scripts/install-charts.sh | 23 +- linkis-dist/helm/scripts/install-ldh.sh | 7 +- .../{install-charts.sh => install-linkis.sh} | 6 +- linkis-dist/helm/scripts/login-pod.sh | 33 +- .../helm/scripts/{login-pod.sh => logs-pod.sh} | 30 +- linkis-dist/helm/scripts/prepare-for-spark.sh | 51 ++ linkis-dist/helm/scripts/remote-proxy.sh | 129 +++++ .../helm/scripts/resources/kind-cluster.yaml | 2 + .../resources/ldh/configmaps/configmap-hadoop.yaml | 185 +++----- .../resources/ldh/configmaps/configmap-spark.yaml | 68 +-- linkis-dist/helm/scripts/resources/ldh/ldh.yaml | 98 ++-- .../package/conf/linkis-cg-entrance.properties | 5 + .../conf/linkis-ps-publicservice.properties | 2 +- .../db/upgrade/1.3.0_schema/mysql/linkis_dml.sql | 18 + linkis-dist/package/sbin/ext/linkis-common-start | 10 +- linkis-dist/package/sbin/ext/linkis-mg-gateway | 8 +- linkis-dist/package/sbin/graceful-upgrade.sh | 9 - linkis-dist/package/sbin/linkis-start-all.sh | 6 +- linkis-dist/pom.xml | 1 - linkis-dist/release-docs/LICENSE | 43 +- .../licenses/LICENSE-dss-gateway-support.txt | 201 ++++++++ linkis-dist/src/main/assembly/distribution.xml | 32 +- .../hive/src/main/resources/log4j2.xml | 6 +- linkis-public-enhancements/distribution.xml | 2 - .../server/loader/MetaClassLoaderManager.java | 2 +- .../linkis-gateway-server-support/pom.xml | 7 + linkis-web/src/apps/linkis/view/linkis/index.vue | 1 - .../src/dss/module/resourceSimple/engine.vue | 6 +- pom.xml | 12 +- tool/dependencies/known-dependencies.txt | 42 +- 113 files changed, 3355 insertions(+), 1377 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
