diff --git a/bml/bmlserver/Dockerfile b/bml/bmlserver/Dockerfile index c7c6cf2f14..19973e5c15 100644 --- a/bml/bmlserver/Dockerfile +++ b/bml/bmlserver/Dockerfile @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 +FROM wedatasphere/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-bml.zip /opt/ihome +COPY target/linkis-bml.zip /opt/linkis RUN unzip linkis-bml.zip -WORKDIR /opt/ihome/linkis-bml/bin -ENTRYPOINT ["/opt/ihome/linkis-bml/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-bml/bin +ENTRYPOINT ["/opt/linkis/linkis-bml/bin/startup.sh"] diff --git a/bml/bmlserver/bin/startup.sh b/bml/bmlserver/bin/startup.sh index 064f5fb341..34b2e0dc1a 100755 --- a/bml/bmlserver/bin/startup.sh +++ b/bml/bmlserver/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-bml/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-bml/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-bml.log & diff --git a/contextservice/cs-server/Dockerfile b/contextservice/cs-server/Dockerfile index 45746f8bd9..9c136f496f 100644 --- a/contextservice/cs-server/Dockerfile +++ b/contextservice/cs-server/Dockerfile @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 +FROM wedatasphere/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-cs-server.zip /opt/ihome +COPY target/linkis-cs-server.zip /opt/linkis RUN unzip linkis-cs-server.zip -WORKDIR /opt/ihome/linkis-cs-server/bin -ENTRYPOINT ["/opt/ihome/linkis-cs-server/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-cs-server/bin +ENTRYPOINT ["/opt/linkis/linkis-cs-server/bin/startup.sh"] diff --git a/contextservice/cs-server/bin/startup.sh b/contextservice/cs-server/bin/startup.sh index 82731662a7..7ed6a42bde 100755 --- a/contextservice/cs-server/bin/startup.sh +++ b/contextservice/cs-server/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-cs-server/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-cs-server/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-cs-server.log & diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestPersistTask.java b/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestPersistTask.java index 8bf25b1fb2..a3f2ff4855 100644 --- a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestPersistTask.java +++ b/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestPersistTask.java @@ -62,7 +62,7 @@ public class RequestPersistTask implements Task { private Map source; /** * runType需要和executeApplicationName结合使用，如用户选择了Spark做为服务，他还需要指明使用哪种执行方式，比如pySpark RSpark等 - * runType和runType是同一个属性，为了兼容以前的代码 + * runType和engineType是同一个属性，为了兼容以前的代码 */ private String runType; private String engineType; diff --git a/datasource/datasourcemanager/server/Dockerfile b/datasource/datasourcemanager/server/Dockerfile index f1243aa87b..edda49ab94 100644 --- a/datasource/datasourcemanager/server/Dockerfile +++ b/datasource/datasourcemanager/server/Dockerfile @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 +FROM wedatasphere/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-dsm-server.zip /opt/ihome +COPY target/linkis-dsm-server.zip /opt/linkis RUN unzip linkis-dsm-server.zip -WORKDIR /opt/ihome/linkis-dsm-server/bin -ENTRYPOINT ["/opt/ihome/linkis-dsm-server/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-dsm-server/bin +ENTRYPOINT ["/opt/linkis/linkis-dsm-server/bin/startup.sh"] diff --git a/datasource/datasourcemanager/server/bin/startup.sh b/datasource/datasourcemanager/server/bin/startup.sh index 3005cfbd6b..f02d5247d7 100755 --- a/datasource/datasourcemanager/server/bin/startup.sh +++ b/datasource/datasourcemanager/server/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-dsm-server/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-dsm-server/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-dsm-server.log & diff --git a/datasource/metadatamanager/server/Dockerfile b/datasource/metadatamanager/server/Dockerfile index 479996d2ea..6e7ebcbb45 100644 --- a/datasource/metadatamanager/server/Dockerfile +++ b/datasource/metadatamanager/server/Dockerfile @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 +FROM wedatasphere/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-mdm-server.zip /opt/ihome +COPY target/linkis-mdm-server.zip /opt/linkis RUN unzip linkis-mdm-server.zip -WORKDIR /opt/ihome/linkis-mdm-server/bin -ENTRYPOINT ["/opt/ihome/linkis-mdm-server/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-mdm-server/bin +ENTRYPOINT ["/opt/linkis/linkis-mdm-server/bin/startup.sh"] diff --git a/datasource/metadatamanager/server/bin/startup.sh b/datasource/metadatamanager/server/bin/startup.sh index b4524573d1..6dbfef72f7 100755 --- a/datasource/metadatamanager/server/bin/startup.sh +++ b/datasource/metadatamanager/server/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-mdm-server/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-mdm-server/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-mdm-server.log & diff --git a/datasource/metadatamanager/service/elasticsearch/Dockerfile b/datasource/metadatamanager/service/elasticsearch/Dockerfile index 3cfe575049..4736fd79a5 100644 --- a/datasource/metadatamanager/service/elasticsearch/Dockerfile +++ b/datasource/metadatamanager/service/elasticsearch/Dockerfile @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 +FROM wedatasphere/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-mdm-service-es.zip /opt/ihome +COPY target/linkis-mdm-service-es.zip /opt/linkis RUN unzip linkis-mdm-service-es.zip -WORKDIR /opt/ihome/linkis-mdm-service-es/bin -ENTRYPOINT ["/opt/ihome/linkis-mdm-service-es/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-mdm-service-es/bin +ENTRYPOINT ["/opt/linkis/linkis-mdm-service-es/bin/startup.sh"] diff --git a/datasource/metadatamanager/service/elasticsearch/bin/startup.sh b/datasource/metadatamanager/service/elasticsearch/bin/startup.sh index f89400d6c0..c8b036aa9e 100755 --- a/datasource/metadatamanager/service/elasticsearch/bin/startup.sh +++ b/datasource/metadatamanager/service/elasticsearch/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-mdm-service-es/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-mdm-service-es/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-mdm-service-es.log & diff --git a/datasource/metadatamanager/service/hive/Dockerfile b/datasource/metadatamanager/service/hive/Dockerfile index ce6f584137..1f6244a87e 100644 --- a/datasource/metadatamanager/service/hive/Dockerfile +++ b/datasource/metadatamanager/service/hive/Dockerfile @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 +FROM wedatasphere/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-mdm-service-hive.zip /opt/ihome +COPY target/linkis-mdm-service-hive.zip /opt/linkis RUN unzip linkis-mdm-service-hive.zip -WORKDIR /opt/ihome/linkis-mdm-service-hive/bin -ENTRYPOINT ["/opt/ihome/linkis-mdm-service-hive/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-mdm-service-hive/bin +ENTRYPOINT ["/opt/linkis/linkis-mdm-service-hive/bin/startup.sh"] diff --git a/datasource/metadatamanager/service/hive/bin/startup.sh b/datasource/metadatamanager/service/hive/bin/startup.sh index f01c74e626..42dda62d8f 100755 --- a/datasource/metadatamanager/service/hive/bin/startup.sh +++ b/datasource/metadatamanager/service/hive/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-mdm-service-hive/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-mdm-service-hive/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-mdm-service-hive.log & diff --git a/datasource/metadatamanager/service/mysql/Dockerfile b/datasource/metadatamanager/service/mysql/Dockerfile index 346b7b6b5b..269399c5bc 100644 --- a/datasource/metadatamanager/service/mysql/Dockerfile +++ b/datasource/metadatamanager/service/mysql/Dockerfile @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 +FROM wedatasphere/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-mdm-service-mysql.zip /opt/ihome +COPY target/linkis-mdm-service-mysql.zip /opt/linkis RUN unzip linkis-mdm-service-mysql.zip -WORKDIR /opt/ihome/linkis-mdm-service-mysql/bin -ENTRYPOINT ["/opt/ihome/linkis-mdm-service-mysql/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-mdm-service-mysql/bin +ENTRYPOINT ["/opt/linkis/linkis-mdm-service-mysql/bin/startup.sh"] diff --git a/datasource/metadatamanager/service/mysql/bin/startup.sh b/datasource/metadatamanager/service/mysql/bin/startup.sh index 14a03136c1..ea13108aba 100755 --- a/datasource/metadatamanager/service/mysql/bin/startup.sh +++ b/datasource/metadatamanager/service/mysql/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-mdm-service-mysql/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-mdm-service-mysql/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-mdm-service-mysql.log & diff --git a/docs/en_US/ch4/k8s.MD b/docs/en_US/ch4/k8s.MD new file mode 100644 index 0000000000..b6de3df1e4 --- /dev/null +++ b/docs/en_US/ch4/k8s.MD @@ -0,0 +1,117 @@ +Linkis on kubernetes + +#Focus on solving the problem +1.During the deployment process, everyone will encounter package conflicts, operating system incompatibility, openjdk, hotspot jdk compatibility issues, docker delivery can fundamentally solve these problems + +2.Docker is based on cgroup resource isolation, shared file system, namespace can limit computing resources lightly, and expand and shrink in seconds + + For example: limit a process to only use 20% of the resources of a CPU core + cd /sys/fs/cgroup/cpu + touch test + $ echo 10000 > cpu.cfs_quota_us + $ echo 50000 > cpu.cfs_period_us + Start a process, please do not do this in production! ! ! ! + $ while :; do :; done & + Record the current process ID + $ echo pid >> tasks + +#Deployment document + +##The method of compiling basic image and each microservice image + + Currently all microservice images are uploaded to dockerhub，https://hub.docker.com/repository/docker/wedatasphere/linkis + + In consideration of the deployment version of the virtual machine, we add a new pom_k8s.xml，the default packaging method is the same as before. If you want to compile the image yourself, you need to quote pom_k8s.xml + + mvn clean package -f gateway/gateway-ujes-support/pom_k8s.xml + + 一.create kubernetes docker secret + + k8s/registry.yaml Modify the account, password, and mirror warehouse address of the corresponding harbor + Or create a secret manually, and then pull the mirror to use. Please modify the private docker warehouse to a private repository address + $kubectl create secret docker-registry registry-key \ + --docker-server=https://hub.docker.com \ + --docker-username=wedatasphere \ + --docker-password=***** \ + --docker-email=wedatasphere@webank.com + + 二.NFS/ceph build + + After building NFS or ceph, the deployment of microservices such as publicservice needs to modify the address of nfs + + 三.Basic image creation file (you can skip this step if you use the officially maintained image) + The method of making a basic image yourself is as follows： + * Environment variable settings + + > Set the harbor's environment variable address + ``` + export HARBOR_LINKIS= + ``` + + * Basic image compilation and packaging + > packaging + ``` + cd Linkis/emr-base + docker build -t $HARBOR_LINKIS/linkis:emr-base-spark2.4.4 . + ``` + > push + ``` + docker push $HARBOR_LINKIS/linkis:emr-base-spark2.4.4 + ``` + * Basic dependency package compilation + ``` + mvn clean install -Dmaven.test.skip=true + ``` + + * Replace the basic image of each microservice Dockerfile with your own private server address + ``` + find . -name Dockerfile | xargs grep -rl "FROM wedatasphere/linkis" | xargs sed -i "" "s?FROM wedatasphere/linkis?FROM $HARBOR_LINKIS/linkis?" + find . -name "*.yaml" | xargs grep -rl "image: wedatasphere/linkis" | xargs sed -i "" "s?image: wedatasphere/linkis?image: $HARBOR_LINKIS/linkis?" + ``` + + * Compile each microservice image + + > There is a Dockerfile corresponding to the module under each microservice basedir + Integrate with the company's internal CI/CD, you can directly compile the docker image through the mvn docker plugin + ``` + sh k8s/package.sh + sh k8s/build.sh + sh k8s/push.sh + ``` + + 四、K8S deployment + + 1.Big data environment configuration + > It mainly involves the configuration of hadoop, hive, and spark environment. It is necessary to configure several components on each node of k8s + + ｜ Component ｜ Version | Node directory ｜ + ｜ --- | --- | --- | + | hadoop | 2.7.7 | /opt/hadoop/hadoop-2.7.7 | + | hive | 2.3.6 | /opt/hive/apache-hive-2.3.6-bin | + | spark | 2.4 | /opt/spark/spark-2.4.4-bin-hadoop2.7 | + + 2.Start eureka + Eureka can be deployed on any node node of k8s + After starting eureka successfully + Modify eurekaUrl in Linkis/k8s/linkis-eureka-configmap.yaml + + 3.Modify linkis-*- configmap.yaml in the k8s directory + Pay special attention to the correctness of the configuration file to avoid low-level problems in subsequent deployments, such as failure to connect to the database, incorrect hdfs address, etc. + For example, copy gateway/linkis.properties to k8s/linkis-gateway-configmap.yaml + + 4.Run the startup script in the k8s directory + sh init.sh + Observe the services registered on eureka, there are 22 services in total, and there is basically no problem if they start successfully. + + 五、When spark is a virtual machine deployment, the virtual layer 2 network of the k8s environment opens up the virtual machine ip segment + + Static routing + iptables/netfilter address masquerading + executor to pod, svc network communication + + executor adds static routing table + route add -net 127.0.0.1 netmask 255.255.0.0 gw 127.0.0.1 + route add -net 127.0.0.1 netmask 255.255.0.0 gw 127.0.0.1 + + Do ip masque on k8s node + iptables -t nat -A POSTROUTING -s 127.0.0.1 /24 -d 127.0.0.1/16 -j MASQUERADE + iptables -t nat -A POSTROUTING -s 127.0.0.1 /24 -d 127.0.0.1 /12 -j MASQUERADE diff --git a/docs/zh_CN/ch6/k8s.MD b/docs/zh_CN/ch6/k8s.MD index c4a6a8323c..c6429528b6 100644 --- a/docs/zh_CN/ch6/k8s.MD +++ b/docs/zh_CN/ch6/k8s.MD @@ -16,10 +16,10 @@ Linkis on kubernetes $ echo pid >> tasks #部署文档 + ##基础镜像及各服务镜像编译方法 - 目前所有微服务镜像都上传到dockerhub，https://hub.docker.com/repository/docker/zhangrong1027/linkis,webank - 申请的镜像仓库下来，我们会持续维护docker到新镜像仓库 + 目前所有微服务镜像都上传到dockerhub，https://hub.docker.com/repository/docker/wedatasphere/linkis 出于对虚机部署版本的考虑，新增了pom_k8s.xml，默认打包方式跟之前保持一致，如果想要自己编译镜像，需要引用pom_k8s.xml @@ -31,9 +31,9 @@ Linkis on kubernetes 或者手动创建secret，后续拉取镜像使用，私有docker仓库请修改成私有reposity地址 $kubectl create secret docker-registry registry-key \ --docker-server=https://hub.docker.com \ - --docker-username=zhangrong1027 \ + --docker-username=wedatasphere \ --docker-password=***** \ - --docker-email=brian.rongzhang@gmail.com + --docker-email=wedatasphere@webank.com 二.NFS/ceph 搭建 @@ -41,56 +41,65 @@ Linkis on kubernetes 三.基础镜像创建文件（使用官方维护的镜像可以跳过该步骤） 自己制作基础镜像方法如下： - 基础镜像基于centos最新版本 - - 目录结构如下 - --linkis - --emr-base - --Dockerfile - --README.MD - --hadoop - --etc - --conf - -- hdfs-site.xml - -- yarn-site.xml - -- map-red.xml - ... - -- hive - --conf - -- jdk-8u211-linux-x64.tar.gz - -- scala-2.11.0.tgz - -- spark-2.4.4-bin-hadoop2.7.tgz - - ### 基础镜像编译 - cd Linkis/emr-base - docker build -t zhangrong1027/linkis:emr-base-spark2.4.4 . - 推送基础镜像到harbor - docker push zhangrong1027/linkis:emr-base-spark2.4.4 - - - - ### 编译各微服务镜像 - 各个微服务basedir下面有对应module 的dockerfile - 与公司内部的CI/CD集成，可以通过mvn docker插件直接编译docker 镜像 - 编译 - Linkis 根目录执行 - mvn clean package -f gateway/gateway-ujes-support/pom_k8s.xml - docker images | grep linkis-gateway - 可以看到已经编译好的镜像 - docker push zhangrong1027/linkis:linkis-gateway + * 环境变量设置 + + > 设置harbor的地址环境变量 + ``` + export HARBOR_LINKIS= + ``` + + * 基础镜像编译打包 + > 打包 + ``` + cd Linkis/emr-base + docker build -t $HARBOR_LINKIS/linkis:emr-base-spark2.4.4 . + ``` + > 推送 + ``` + docker push $HARBOR_LINKIS/linkis:emr-base-spark2.4.4 + ``` + * 基础依赖包编译 + ``` + mvn clean install -Dmaven.test.skip=true + ``` + * 替换各个微服务Dockerfile的基础镜像为自己的私服地址 + ``` + find . -name Dockerfile | xargs grep -rl "FROM wedatasphere/linkis" | xargs sed -i "" "s?FROM wedatasphere/linkis?FROM $HARBOR_LINKIS/linkis?" + find . -name "*.yaml" | xargs grep -rl "image: wedatasphere/linkis" | xargs sed -i "" "s?image: wedatasphere/linkis?image: $HARBOR_LINKIS/linkis?" + ``` + + * 编译各微服务镜像 + + > 各个微服务basedir下面有对应 module 的 Dockerfile + 与公司内部的CI/CD集成，可以通过mvn docker插件直接编译docker镜像 + ``` + sh k8s/package.sh + sh k8s/build.sh + sh k8s/push.sh + ``` + 四、K8S部署 - - 1.启动eureka + + 1.大数据环境配置 + > 主要涉及 hadoop，hive，spark环境配置，需要将几个组件的配置在k8s各个节点上 + + ｜ 组件 ｜ 版本 | 节点目录 ｜ + ｜ --- | --- | --- | + | hadoop | 2.7.7 | /opt/hadoop/hadoop-2.7.7 | + | hive | 2.3.6 | /opt/hive/apache-hive-2.3.6-bin | + | spark | 2.4 | /opt/spark/spark-2.4.4-bin-hadoop2.7 | + + 2.启动eureka eureka部署在k8s的任意一个node节点上就可以 启动eureka成功后 修改Linkis/k8s/linkis-eureka-configmap.yaml中的eurekaUrl - 2.修改k8s目录下的linkis-*- configmap.yaml + 3.修改k8s目录下的linkis-*- configmap.yaml 特别注意配置文件的正确性，避免后续部署的低级问题出现，如数据库连接不上，hdfs地址不正确等等 例如gateway/linkis.properties 复制到k8s/linkis-gateway-configmap.yaml - 3.运行k8s目录下的 + 4.运行k8s目录下的 sh init.sh 观察eureka上注册的服务，一共22个，都启动成功基本就没有问题 diff --git a/emr-base/Dockerfile b/emr-base/Dockerfile index 8bd7890c9a..c42b7315b3 100644 --- a/emr-base/Dockerfile +++ b/emr-base/Dockerfile @@ -14,24 +14,49 @@ # limitations under the License. FROM centos:latest -MAINTAINER brian.rongzhang@gmail.com +MAINTAINER wedatasphere@webank.com RUN yum -y install wget tar && \ mkdir /opt/{flink,hadoop,spark,hive} WORKDIR /tmp -COPY hive/conf /opt/hive/apache-hive-2.3.6-bin/conf -COPY hadoop/conf /opt/hadoop/hadoop-2.7.7/etc/hadoop -COPY jdk-8u221-linux-x64.tar.gz /tmp -COPY scala-2.11.8.tgz /tmp -COPY spark-2.4.4-bin-hadoop2.7.tgz /tmp +RUN wget -O jdk-8u221-linux-x64.tar.gz \ + -c --content-disposition \ + "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=239835_230deb18db3e4014bb8e3e8324f81b43" && \ + wget "https://archive.apache.org/dist/flink/flink-1.7.2/flink-1.7.2-bin-hadoop27-scala_2.11.tgz" && \ + wget "https://downloads.lightbend.com/scala/2.11.8/scala-2.11.8.tgz" && \ + wget "http://archive.apache.org/dist/spark/spark-2.4.4/spark-2.4.4-bin-hadoop2.7.tgz" && \ + wget "http://archive.apache.org/dist/hive/hive-2.3.6/apache-hive-2.3.6-bin.tar.gz" && \ + wget "http://archive.apache.org/dist/hadoop/common/hadoop-2.7.7/hadoop-2.7.7.tar.gz" -RUN tar xf jdk-8u221-linux-x64.tar.gz -C /usr/local/ && \ + +#COPY flink-1.7.2-bin-hadoop27-scala_2.11.tgz . +#COPY scala-2.11.8.tgz . +#COPY jdk-8u221-linux-x64.tar.gz . +#COPY hadoop-2.7.7.tar.gz . +#COPY spark-2.4.4-bin-hadoop2.7.tgz . +#COPY apache-hive-2.3.6-bin.tar.gz . + +RUN tar xf flink-1.7.2-bin-hadoop27-scala_2.11.tgz -C /opt/flink/ && \ tar xf scala-2.11.8.tgz -C /usr/local/ && \ + tar xf jdk-8u221-linux-x64.tar.gz -C /usr/local/ && \ + tar xf hadoop-2.7.7.tar.gz -C /opt/hadoop/ && \ tar xf spark-2.4.4-bin-hadoop2.7.tgz -C /opt/spark/ && \ + tar xf apache-hive-2.3.6-bin.tar.gz -C /opt/hive/ && \ rm -f *.tgz *.tar.gz +#COPY hive/conf /opt/hive/apache-hive-2.3.6-bin/conf +#COPY hadoop/conf /opt/hadoop/hadoop-2.7.7/etc/hadoop +#COPY jdk-8u221-linux-x64.tar.gz /tmp +#COPY scala-2.11.8.tgz /tmp +#COPY spark-2.4.4-bin-hadoop2.7.tgz /tmp +# +#RUN tar xf jdk-8u221-linux-x64.tar.gz -C /usr/local/ && \ +# tar xf scala-2.11.8.tgz -C /usr/local/ && \ +# tar xf spark-2.4.4-bin-hadoop2.7.tgz -C /opt/spark/ && \ +# rm -f *.tgz *.tar.gz + ENV TIME_ZONE Asia/Shanghai ENV SPARK_HOME=/opt/spark/spark-2.4.4-bin-hadoop2.7 ENV SPARK_CONF_DIR=$SPARK_HOME/conf diff --git a/gateway/gateway-ujes-support/Dockerfile b/gateway/gateway-ujes-support/Dockerfile index b8f270ab10..e7016a1236 100644 --- a/gateway/gateway-ujes-support/Dockerfile +++ b/gateway/gateway-ujes-support/Dockerfile @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 +FROM wedatasphere/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-gateway.zip /opt/ihome +COPY target/linkis-gateway.zip /opt/linkis RUN unzip linkis-gateway.zip -WORKDIR /opt/ihome/linkis-gateway/bin -ENTRYPOINT ["/opt/ihome/linkis-gateway/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-gateway/bin +ENTRYPOINT ["/opt/linkis/linkis-gateway/bin/startup.sh"] diff --git a/gateway/gateway-ujes-support/bin/startup.sh b/gateway/gateway-ujes-support/bin/startup.sh index 53caa43b98..2b531e25e9 100755 --- a/gateway/gateway-ujes-support/bin/startup.sh +++ b/gateway/gateway-ujes-support/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-gateway/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-gateway/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-gateway.log & diff --git a/gateway/gateway-ujes-support/dockerinfo/image-name b/gateway/gateway-ujes-support/dockerinfo/image-name index fb81548f09..c17be8314f 100644 --- a/gateway/gateway-ujes-support/dockerinfo/image-name +++ b/gateway/gateway-ujes-support/dockerinfo/image-name @@ -1 +1 @@ -zhangrong1027/linkis:linkis-gateway +wedatasphere/linkis:linkis-gateway diff --git a/gateway/gateway-ujes-support/dockerinfo/repository b/gateway/gateway-ujes-support/dockerinfo/repository index e6d30e9df8..d2b33f60b5 100644 --- a/gateway/gateway-ujes-support/dockerinfo/repository +++ b/gateway/gateway-ujes-support/dockerinfo/repository @@ -1 +1 @@ -zhangrong1027/linkis +wedatasphere/linkis diff --git a/k8s/README.MD b/k8s/README.MD index 09b298f8c9..f21d236297 100644 --- a/k8s/README.MD +++ b/k8s/README.MD @@ -4,65 +4,101 @@ Linkis on kubernetes 1.每个人在部署过程中，都会遇到包冲突，操作系统不兼容，openjdk，hotspot jdk兼容问题，docker交付可以从根本上解决这些问题 2.docker基于cgroup资源隔离，共享文件系统，namespace 可以轻量限制计算资源，秒级扩缩容 - 例如：限制某个进程只能使用CPU一个核的20%资源 - cd /sys/fs/cgroup/cpu - touch test - $ echo 10000 > cpu.cfs_quota_us - $ echo 50000 > cpu.cfs_period_us - 启动一个进程，请不要在生产做这样操作！！！！ - $ while :; do :; done & - 记录当前进程Id - $ echo pid >> tasks -#部署文档 -## 环境变量设置 - -> 设置harbor的地址环境变量 + 例如：限制某个进程只能使用CPU一个核的20%资源 + cd /sys/fs/cgroup/cpu + touch test + $ echo 10000 > cpu.cfs_quota_us + $ echo 50000 > cpu.cfs_period_us + 启动一个进程，请不要在生产做这样操作！！！！ + $ while :; do :; done & + 记录当前进程Id + $ echo pid >> tasks - export HARBOR= +#部署文档 ##基础镜像及各服务镜像编译方法 - registry.yaml 修改对应harbor的账号，密码，镜像内网地址 - 基础镜像基于centos最新版本 - 目录结构如下 - --linkis - --emr-base - --Dockerfile - --README.MD - --hadoop - --etc - --conf - -- hdfs-site.xml - -- yarn-site.xml - -- map-red.xml - ... - -- hive - --conf - -- jdk-8u211-linux-x64.tar.gz - -- scala-2.11.0.tgz - -- spark-2.4.4-bin-hadoop2.7.tgz - -###基础镜像编译 -cd emr-base -docker build -t $HARBOR/library/linkis:emr-base-spark2.4.4 . -推送基础镜像到harbor -docker push $HARBOR/library/linkis:emr-base-spark2.4.4 + 目前所有微服务镜像都上传到dockerhub，https://hub.docker.com/repository/docker/wedatasphere/linkis + + 出于对虚机部署版本的考虑，新增了pom_k8s.xml，默认打包方式跟之前保持一致，如果想要自己编译镜像，需要引用pom_k8s.xml + + mvn clean package -f gateway/gateway-ujes-support/pom_k8s.xml + + 一.创建kubernetes docker secret + + k8s/registry.yaml 修改对应harbor的账号，密码，镜像仓库地址 + 或者手动创建secret，后续拉取镜像使用，私有docker仓库请修改成私有reposity地址 + $kubectl create secret docker-registry registry-key \ + --docker-server=https://hub.docker.com \ + --docker-username=wedatasphere \ + --docker-password=***** \ + --docker-email=wedatasphere@webank.com + + 二.NFS/ceph 搭建 + + 搭建NFS或者ceph完成后，publicservice等微服务的deployment需要修改nfs的地址 + + 三.基础镜像创建文件（使用官方维护的镜像可以跳过该步骤） + 自己制作基础镜像方法如下： + * 环境变量设置 + + > 设置harbor的地址环境变量 + ``` + export HARBOR_LINKIS= + ``` + + * 基础镜像编译打包 + > 打包 + ``` + cd Linkis/emr-base + docker build -t $HARBOR_LINKIS/linkis:emr-base-spark2.4.4 . + ``` + > 推送 + ``` + docker push $HARBOR_LINKIS/linkis:emr-base-spark2.4.4 + ``` + * 基础依赖包编译 + ``` + mvn clean install -Dmaven.test.skip=true + ``` - -###编译各微服务镜像 -各个微服务basedir下面有对应module 的dockerfile -与公司内部的CI/CD集成，可以通过mvn docker插件直接编译docker 镜像 -编译 - Linkis 根目录执行 - mvn clean package -f gateway/gateway-ujes-support/pom.xml - docker images | grep linkis-gateway -可以看到已经编译好的镜像 - docker push $HARBOR/library/linkis:linkis-gateway - -#K8S部署 -1.修改k8s目录下的docker secret - register.yaml 镜像地址，账号，密码 -2.修改k8s目录下的linkis-*- configmap.yaml - 例如gateway/linkis.properties 复制到k8s/linkis-gateway-configmap.yaml -3.运行k8s 目录下的 sh init.sh + * 替换各个微服务Dockerfile的基础镜像为自己的私服地址 + ``` + find . -name Dockerfile | xargs grep -rl "FROM wedatasphere/linkis" | xargs sed -i "" "s?FROM wedatasphere/linkis?FROM $HARBOR_LINKIS/linkis?" + find . -name "*.yaml" | xargs grep -rl "image: wedatasphere/linkis" | xargs sed -i "" "s?image: wedatasphere/linkis?image: $HARBOR_LINKIS/linkis?" + ``` + + * 编译各微服务镜像 + + > 各个微服务basedir下面有对应 module 的 Dockerfile + 与公司内部的CI/CD集成，可以通过mvn docker插件直接编译docker镜像 + ``` + sh k8s/package.sh + sh k8s/build.sh + sh k8s/push.sh + ``` + + 四、K8S部署 + + 1.大数据环境配置 + > 主要涉及 hadoop，hive，spark环境配置，需要将几个组件的配置在k8s各个节点上 + + ｜ 组件 ｜ 版本 | 节点目录 ｜ + ｜ --- | --- | --- | + | hadoop | 2.7.7 | /opt/hadoop/hadoop-2.7.7 | + | hive | 2.3.6 | /opt/hive/apache-hive-2.3.6-bin | + | spark | 2.4 | /opt/spark/spark-2.4.4-bin-hadoop2.7 | + + 2.启动eureka + eureka部署在k8s的任意一个node节点上就可以 + 启动eureka成功后 + 修改Linkis/k8s/linkis-eureka-configmap.yaml中的eurekaUrl + + 3.修改k8s目录下的linkis-*- configmap.yaml + 特别注意配置文件的正确性，避免后续部署的低级问题出现，如数据库连接不上，hdfs地址不正确等等 + 例如gateway/linkis.properties 复制到k8s/linkis-gateway-configmap.yaml + + 4.运行k8s目录下的 + sh init.sh + 观察eureka上注册的服务，一共22个，都启动成功基本就没有问题 diff --git a/k8s/build.sh b/k8s/build.sh new file mode 100644 index 0000000000..abdf1857ce --- /dev/null +++ b/k8s/build.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +# docker build -t $HARBOR_LINKIS/linkis:emr-base-spark2.4.4 -f emr-base/Dockerfile . + +docker build -t $HARBOR_LINKIS/linkis:linkis-bml-0.10.0 -f bml/bmlserver/Dockerfile bml/bmlserver + +docker build -t $HARBOR_LINKIS/linkis:linkis-dsm-server-0.10.0 -f datasource/datasourcemanager/server/Dockerfile datasource/datasourcemanager/server + +docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-server-0.10.0 -f datasource/metadatamanager/server/Dockerfile datasource/metadatamanager/server +docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-service-mysql-0.10.0 -f datasource/metadatamanager/service/mysql/Dockerfile datasource/metadatamanager/service/mysql +docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-service-es-0.10.0 -f datasource/metadatamanager/service/elasticsearch/Dockerfile datasource/metadatamanager/service/elasticsearch +docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-service-hive-0.10.0 -f datasource/metadatamanager/service/hive/Dockerfile datasource/metadatamanager/service/hive + +docker build -t $HARBOR_LINKIS/linkis:linkis-gateway-0.10.0 -f gateway/gateway-ujes-support/Dockerfile gateway/gateway-ujes-support + +docker build -t $HARBOR_LINKIS/linkis:linkis-resourcemanager-0.10.0 -f resourceManager/resourcemanagerserver/Dockerfile resourceManager/resourcemanagerserver + +docker build -t $HARBOR_LINKIS/linkis:linkis-cs-server-0.10.0 -f contextservice/cs-server/Dockerfile contextservice/cs-server + +docker build -t $HARBOR_LINKIS/linkis:linkis-metadata-0.10.0 -f metadata/Dockerfile metadata + +docker build -t $HARBOR_LINKIS/linkis:linkis-publicservice-0.10.0 -f publicService/Dockerfile publicService + +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-spark-enginemanager-0.10.0 -f ujes/definedEngines/spark/enginemanager/Dockerfile ujes/definedEngines/spark/enginemanager +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-spark-entrance-0.10.0 -f ujes/definedEngines/spark/entrance/Dockerfile ujes/definedEngines/spark/entrance + +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-hive-enginemanager-0.10.0 -f ujes/definedEngines/hive/enginemanager/Dockerfile ujes/definedEngines/hive/enginemanager +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-hive-entrance-0.10.0 -f ujes/definedEngines/hive/entrance/Dockerfile ujes/definedEngines/hive/entrance + +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-python-enginemanager-0.10.0 -f ujes/definedEngines/python/enginemanager/Dockerfile ujes/definedEngines/python/enginemanager +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-python-entrance-0.10.0 -f ujes/definedEngines/python/entrance/Dockerfile ujes/definedEngines/python/entrance + +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-enginemanager-0.10.0 -f ujes/definedEngines/pipeline/enginemanager/Dockerfile ujes/definedEngines/pipeline/enginemanager +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-entrance-0.10.0 -f ujes/definedEngines/pipeline/entrance/Dockerfile ujes/definedEngines/pipeline/entrance + +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-jdbc-enginemanager-0.10.0 -f ujes/definedEngines/jdbc/entrance/Dockerfile ujes/definedEngines/jdbc/entrance + +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-mlsql-entrance-0.10.0 -f ujes/definedEngines/mlsql/entrance/Dockerfile ujes/definedEngines/mlsql/entrance + +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-shell-enginemanager-0.10.0 -f ujes/definedEngines/shell/entrance/Dockerfile ujes/definedEngines/shell/entrance +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-shell-entrance-0.10.0 -f ujes/definedEngines/shell/enginemanager/Dockerfile ujes/definedEngines/shell/enginemanager + + diff --git a/k8s/init.sh b/k8s/init.sh index 858db19b6c..61748af2ed 100644 --- a/k8s/init.sh +++ b/k8s/init.sh @@ -6,6 +6,7 @@ kubectl create -f linkis-gateway-configmap.yaml kubectl create -f linkis-metadata-configmap.yaml kubectl create -f linkis-publicservice-configmap.yaml kubectl create -f linkis-resourcemanager-configmap.yaml +kubectl create -f linkis-cs-server-configmap.yaml kubectl create -f linkis-bml-configmap.yaml kubectl create -f linkis-ujes-hive-enginemanager-configmap.yaml kubectl create -f linkis-ujes-hive-entrance-configmap.yaml @@ -32,6 +33,7 @@ kubectl create -f linkis-bml-deployment.yaml kubectl create -f linkis-metadata-deployment.yaml kubectl create -f linkis-publicservice-deployment.yaml kubectl create -f linkis-resourcemanager-deployment.yaml +kubectl create -f linkis-cs-server-deployment.yaml kubectl create -f linkis-ujes-jdbc-entrance-deployment.yaml kubectl create -f linkis-ujes-hive-entrance-deployment.yaml kubectl create -f linkis-ujes-hive-enginemanager-deployment.yaml diff --git a/k8s/linkis-bml-deployment.yaml b/k8s/linkis-bml-deployment.yaml index 3988f63cde..3fe08553bd 100644 --- a/k8s/linkis-bml-deployment.yaml +++ b/k8s/linkis-bml-deployment.yaml @@ -47,11 +47,11 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-bml - image: zhangrong1027/linkis:linkis-bml-0.10.0 + image: wedatasphere/linkis:linkis-bml-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-bml/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-bml/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -73,11 +73,17 @@ spec: value: "14009" volumeMounts: - name: linkis-bml-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-bml/logs + mountPath: /opt/linkis/linkis-bml/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -93,4 +99,13 @@ spec: # server: 10.206.0.12 - name: varlog hostPath: - path: /var/log \ No newline at end of file + path: /var/log + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-cs-server-configmap.yaml b/k8s/linkis-cs-server-configmap.yaml new file mode 100644 index 0000000000..4ed38082ef --- /dev/null +++ b/k8s/linkis-cs-server-configmap.yaml @@ -0,0 +1,44 @@ +# +# Copyright 2019 WeBank +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +apiVersion: v1 +data: + linkis.properties: |+ + #wds.linkis.test.mode=true + wds.linkis.server.mybatis.datasource.url=jdbc:mysql://127.0.0.1:3306/ide_gz_bdap_sit_01?characterEncoding=UTF-8 + wds.linkis.server.mybatis.datasource.username= + wds.linkis.server.mybatis.datasource.password= + wds.linkis.log.clear=true + wds.linkis.server.version=v1 + ##restful + wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.linkis.cs.server.restful + ##mybatis + wds.linkis.server.mybatis.mapperLocations=classpath*:com\\webank\\wedatasphere\\linkis\\cs\\persistence\\dao\\impl\\*.xml + wds.linkis.server.mybatis.typeAliasesPackage=com.webank.wedatasphere.linkis.cs.persistence.entity + wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.linkis.cs.persistence.dao + +kind: ConfigMap +metadata: + managedFields: + - apiVersion: v1 + fieldsType: FieldsV1 + fieldsV1: + f:data: + .: {} + f:linkis-cs-server.properties: {} + manager: kubectl + operation: Update + name: linkis-cs-server-config + namespace: default + diff --git a/k8s/linkis-cs-server-deployment.yaml b/k8s/linkis-cs-server-deployment.yaml new file mode 100644 index 0000000000..1b1eb80ebf --- /dev/null +++ b/k8s/linkis-cs-server-deployment.yaml @@ -0,0 +1,115 @@ +# +# Copyright 2019 WeBank +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: linkis-cs-server-deployment +spec: + replicas: 1 + selector: + matchLabels: + app: linkis-cs-server + # release: dev + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 1 + type: RollingUpdate + template: + metadata: + labels: + app: linkis-cs-server + release: dev + spec: + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: "app" + operator: In + values: + - linkis-cs-server + topologyKey: "kubernetes.io/hostname" + containers: + - name: linkis-cs-server + image: wedatasphere/linkis:linkis-cs-server-0.10.0 + lifecycle: + preStop: + exec: + command: ["sh","/opt/linkis/linkis-cs-server/bin/stop.sh"] + imagePullPolicy: Always + ports: + - name: http + containerPort: 14004 + livenessProbe: + tcpSocket: + port: 14004 + initialDelaySeconds: 15 + periodSeconds: 20 + env: + - name: eurekaurl + valueFrom: + configMapKeyRef: + name: eureka-config + key: eurekaUrl + - name: EUREKA_URL + valueFrom: + configMapKeyRef: + name: eureka-config + key: eurekaUrl + - name: SERVER_HEAP_SIZE + value: 1024M + - name: START_PORT + value: "14004" + volumeMounts: + - name: linkis-cs-server-config + mountPath: /opt/linkis/conf + # - name: resultset + # mountPath: /opt/linkis/data + - name: varlog + mountPath: /opt/linkis/linkis-cs-server/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf + imagePullSecrets: + - name: registry-key + volumes: + - name: linkis-cs-server-config + configMap: + name: linkis-cs-server-config + # - name: resultset + # nfs: + # path: /data/k8s + # server: 10.206.0.12 + - name: varlog + hostPath: + path: /var/log + - name: eureka-config + configMap: + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-dsm-server-deployment.yaml b/k8s/linkis-dsm-server-deployment.yaml index aa44c557f6..e01377b1fc 100644 --- a/k8s/linkis-dsm-server-deployment.yaml +++ b/k8s/linkis-dsm-server-deployment.yaml @@ -45,11 +45,11 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-dsm-server - image: zhangrong1027/linkis:linkis-dsm-server-0.10.0 + image: wedatasphere/linkis:linkis-dsm-server-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-dsm-server/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-dsm-server/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -76,11 +76,17 @@ spec: value: "22000" volumeMounts: - name: linkis-dsm-server-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-dsm-server/logs + mountPath: /opt/linkis/linkis-dsm-server/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -96,4 +102,13 @@ spec: # server: 10.206.0.12 - name: varlog hostPath: - path: /var/log \ No newline at end of file + path: /var/log + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-gateway-deployment.yaml b/k8s/linkis-gateway-deployment.yaml index e2fe1e5ab3..9d2690b5af 100644 --- a/k8s/linkis-gateway-deployment.yaml +++ b/k8s/linkis-gateway-deployment.yaml @@ -45,11 +45,11 @@ spec: containers: - name: linkis-gateway - image: zhangrong1027/linkis:linkis-gateway-0.10.0 + image: wedatasphere/linkis:linkis-gateway-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-gateway/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-gateway/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -72,11 +72,17 @@ spec: value: "14001" volumeMounts: - name: linkis-gateway-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset -# mountPath: /opt/ihome/data +# mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-gateway/logs + mountPath: /opt/linkis/linkis-gateway/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -92,4 +98,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-mdm-server-deployment.yaml b/k8s/linkis-mdm-server-deployment.yaml index f72e285a94..202aee5e98 100644 --- a/k8s/linkis-mdm-server-deployment.yaml +++ b/k8s/linkis-mdm-server-deployment.yaml @@ -45,11 +45,11 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-mdm-server - image: zhangrong1027/linkis:linkis-mdm-server-0.10.0 + image: wedatasphere/linkis:linkis-mdm-server-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-mdm-server/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-mdm-server/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -76,11 +76,17 @@ spec: value: "22001" volumeMounts: - name: linkis-mdm-server-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-mdm-server/logs + mountPath: /opt/linkis/linkis-mdm-server/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -96,4 +102,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-mdm-service-es-deployment.yaml b/k8s/linkis-mdm-service-es-deployment.yaml index 4fca9c5210..01a91abea5 100644 --- a/k8s/linkis-mdm-service-es-deployment.yaml +++ b/k8s/linkis-mdm-service-es-deployment.yaml @@ -45,11 +45,11 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-mdm-service-es - image: zhangrong1027/linkis:linkis-mdm-service-es-0.10.0 + image: wedatasphere/linkis:linkis-mdm-service-es-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-mdm-service-es/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-mdm-service-es/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -76,11 +76,17 @@ spec: value: "22002" volumeMounts: - name: linkis-mdm-service-es-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-mdm-service-es/logs + mountPath: /opt/linkis/linkis-mdm-service-es/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -96,4 +102,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-mdm-service-hive-deployment.yaml b/k8s/linkis-mdm-service-hive-deployment.yaml index 032802fbc2..05efdff2f8 100644 --- a/k8s/linkis-mdm-service-hive-deployment.yaml +++ b/k8s/linkis-mdm-service-hive-deployment.yaml @@ -45,11 +45,11 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-mdm-service-hive - image: zhangrong1027/linkis:linkis-mdm-service-hive-0.10.0 + image: wedatasphere/linkis:linkis-mdm-service-hive-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-mdm-service-hive/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-mdm-service-hive/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -76,11 +76,17 @@ spec: value: "22003" volumeMounts: - name: linkis-mdm-service-hive-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-mdm-service-hive/logs + mountPath: /opt/linkis/linkis-mdm-service-hive/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -96,4 +102,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-mdm-service-mysql-deployment.yaml b/k8s/linkis-mdm-service-mysql-deployment.yaml index f08c2454ac..a1a4778e21 100644 --- a/k8s/linkis-mdm-service-mysql-deployment.yaml +++ b/k8s/linkis-mdm-service-mysql-deployment.yaml @@ -45,11 +45,11 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-mdm-service-mysql - image: zhangrong1027/linkis:linkis-mdm-service-mysql-0.10.0 + image: wedatasphere/linkis:linkis-mdm-service-mysql-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-mdm-service-mysql/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-mdm-service-mysql/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -76,11 +76,17 @@ spec: value: "22004" volumeMounts: - name: linkis-mdm-service-mysql-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-mdm-service-mysql/logs + mountPath: /opt/linkis/linkis-mdm-service-mysql/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -96,4 +102,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-metadata-deployment.yaml b/k8s/linkis-metadata-deployment.yaml index 6335398d24..203b5abdef 100644 --- a/k8s/linkis-metadata-deployment.yaml +++ b/k8s/linkis-metadata-deployment.yaml @@ -45,11 +45,11 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-metadata - image: zhangrong1027/linkis:linkis-metadata-0.10.0 + image: wedatasphere/linkis:linkis-metadata-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-metadata/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-metadata/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -76,11 +76,17 @@ spec: value: "14002" volumeMounts: - name: linkis-metadata-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-metadata/logs + mountPath: /opt/linkis/linkis-metadata/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -96,4 +102,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-publicservice-deployment.yaml b/k8s/linkis-publicservice-deployment.yaml index 3fd05b5332..a3865feea6 100644 --- a/k8s/linkis-publicservice-deployment.yaml +++ b/k8s/linkis-publicservice-deployment.yaml @@ -44,12 +44,12 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-publicservice - image: zhangrong1027/linkis:linkis-publicservice-0.10.0 + image: wedatasphere/linkis:linkis-publicservice-0.10.0 imagePullPolicy: Always lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-publicservice/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-publicservice/bin/stop.sh"] ports: - name: http containerPort: 14003 @@ -75,11 +75,17 @@ spec: value: "14003" volumeMounts: - name: linkis-publicservice-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-publicservice/logs + mountPath: /opt/linkis/linkis-publicservice/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -96,3 +102,12 @@ spec: - name: eureka-config configMap: name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-resourcemanager-deployment.yaml b/k8s/linkis-resourcemanager-deployment.yaml index b1753bccf4..c229fdf022 100644 --- a/k8s/linkis-resourcemanager-deployment.yaml +++ b/k8s/linkis-resourcemanager-deployment.yaml @@ -46,11 +46,11 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-resourcemanager - image: zhangrong1027/linkis:linkis-resourcemanager-0.10.0 + image: wedatasphere/linkis:linkis-resourcemanager-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-resourcemanager/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-resourcemanager/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -77,11 +77,17 @@ spec: value: "14004" volumeMounts: - name: linkis-resourcemanager-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-resourcemanager/logs + mountPath: /opt/linkis/linkis-resourcemanager/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -98,3 +104,12 @@ spec: - name: eureka-config configMap: name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-hive-enginemanager-deployment.yaml b/k8s/linkis-ujes-hive-enginemanager-deployment.yaml index aec4d8aa3b..fb748a69c4 100644 --- a/k8s/linkis-ujes-hive-enginemanager-deployment.yaml +++ b/k8s/linkis-ujes-hive-enginemanager-deployment.yaml @@ -55,11 +55,11 @@ spec: - node1 containers: - name: linkis-ujes-hive-enginemanager - image: zhangrong1027/linkis:linkis-ujes-hive-enginemanager-0.10.0 + image: wedatasphere/linkis:linkis-ujes-hive-enginemanager-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-hive-enginemanager/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-hive-enginemanager/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -86,11 +86,17 @@ spec: value: "16001" volumeMounts: - name: linkis-ujes-hive-enginemanager-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-hive-enginemanager/logs + mountPath: /opt/linkis/linkis-ujes-hive-enginemanager/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -106,4 +112,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-hive-entrance-deployment.yaml b/k8s/linkis-ujes-hive-entrance-deployment.yaml index 93e57787b3..ce30c49425 100644 --- a/k8s/linkis-ujes-hive-entrance-deployment.yaml +++ b/k8s/linkis-ujes-hive-entrance-deployment.yaml @@ -54,11 +54,11 @@ spec: - node1 containers: - name: linkis-ujes-hive-entrance - image: zhangrong1027/linkis:linkis-ujes-hive-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-hive-entrance-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-hive-entrance/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-hive-entrance/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -85,11 +85,17 @@ spec: value: "16000" volumeMounts: - name: linkis-ujes-hive-entrance-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-hive-entrance/logs + mountPath: /opt/linkis/linkis-ujes-hive-entrance/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -105,4 +111,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-jdbc-entrance-deployment.yaml b/k8s/linkis-ujes-jdbc-entrance-deployment.yaml index ac482b575c..bbd8320632 100644 --- a/k8s/linkis-ujes-jdbc-entrance-deployment.yaml +++ b/k8s/linkis-ujes-jdbc-entrance-deployment.yaml @@ -54,11 +54,11 @@ spec: - node3 containers: - name: linkis-ujes-jdbc-entrance - image: zhangrong1027/linkis:linkis-ujes-jdbc-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-jdbc-entrance-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-jdbc-entrance/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-jdbc-entrance/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -85,11 +85,17 @@ spec: value: "14008" volumeMounts: - name: linkis-ujes-jdbc-entrance-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-jdbc-entrance/logs + mountPath: /opt/linkis/linkis-ujes-jdbc-entrance/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -105,4 +111,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-mlsql-entrance-deployment.yaml b/k8s/linkis-ujes-mlsql-entrance-deployment.yaml index 5ef1e8eafe..a94f5a81e7 100644 --- a/k8s/linkis-ujes-mlsql-entrance-deployment.yaml +++ b/k8s/linkis-ujes-mlsql-entrance-deployment.yaml @@ -54,11 +54,11 @@ spec: - node3 containers: - name: linkis-ujes-mlsql-entrance - image: zhangrong1027/linkis:linkis-ujes-mlsql-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-mlsql-entrance-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-mlsql-entrance/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-mlsql-entrance/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -85,11 +85,17 @@ spec: value: "17000" volumeMounts: - name: linkis-ujes-mlsql-entrance-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-mlsql-entrance/logs + mountPath: /opt/linkis/linkis-ujes-mlsql-entrance/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -105,4 +111,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-pipeline-enginemanager-deployment.yaml b/k8s/linkis-ujes-pipeline-enginemanager-deployment.yaml index 015185a0de..71375c141a 100644 --- a/k8s/linkis-ujes-pipeline-enginemanager-deployment.yaml +++ b/k8s/linkis-ujes-pipeline-enginemanager-deployment.yaml @@ -54,11 +54,11 @@ spec: - node3 containers: - name: linkis-ujes-mlsql-entrance - image: zhangrong1027/linkis:linkis-ujes-pipeline-enginemanager-0.10.0 + image: wedatasphere/linkis:linkis-ujes-pipeline-enginemanager-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-pipeline-enginemanager/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-pipeline-enginemanager/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -85,11 +85,17 @@ spec: value: "18001" volumeMounts: - name: linkis-ujes-pipeline-enginemanager-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-pipeline-enginemanager/logs + mountPath: /opt/linkis/linkis-ujes-pipeline-enginemanager/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -105,4 +111,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-pipeline-entrance-deployment.yaml b/k8s/linkis-ujes-pipeline-entrance-deployment.yaml index 09eef38903..15fa3d815a 100644 --- a/k8s/linkis-ujes-pipeline-entrance-deployment.yaml +++ b/k8s/linkis-ujes-pipeline-entrance-deployment.yaml @@ -54,11 +54,11 @@ spec: - node3 containers: - name: linkis-ujes-pipeline-entrance - image: zhangrong1027/linkis:linkis-ujes-pipeline-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-pipeline-entrance-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-pipeline-entrance/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-pipeline-entrance/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -85,11 +85,17 @@ spec: value: "18000" volumeMounts: - name: linkis-ujes-pipeline-entrance-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-pipeline-entrance/logs + mountPath: /opt/linkis/linkis-ujes-pipeline-entrance/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -105,4 +111,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-python-enginemanager-deployment.yaml b/k8s/linkis-ujes-python-enginemanager-deployment.yaml index dcacf22995..98b3f4c0d2 100644 --- a/k8s/linkis-ujes-python-enginemanager-deployment.yaml +++ b/k8s/linkis-ujes-python-enginemanager-deployment.yaml @@ -54,11 +54,11 @@ spec: - node3 containers: - name: linkis-ujes-python-enginemanager - image: zhangrong1027/linkis:linkis-ujes-python-enginemanager-0.10.0 + image: wedatasphere/linkis:linkis-ujes-python-enginemanager-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-python-enginemanager/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-python-enginemanager/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -85,11 +85,17 @@ spec: value: "19001" volumeMounts: - name: linkis-ujes-python-enginemanager-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-python-enginemanager/logs + mountPath: /opt/linkis/linkis-ujes-python-enginemanager/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -105,4 +111,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-python-entrance-deployment.yaml b/k8s/linkis-ujes-python-entrance-deployment.yaml index 2ffecfc93d..ac3d3ed3b9 100644 --- a/k8s/linkis-ujes-python-entrance-deployment.yaml +++ b/k8s/linkis-ujes-python-entrance-deployment.yaml @@ -54,11 +54,11 @@ spec: - node3 containers: - name: linkis-ujes-python-entrance - image: zhangrong1027/linkis:linkis-ujes-python-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-python-entrance-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-python-entrance/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-python-entrance/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -85,11 +85,17 @@ spec: value: "19000" volumeMounts: - name: linkis-ujes-python-entrance-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-python-entrance/logs + mountPath: /opt/linkis/linkis-ujes-python-entrance/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -105,4 +111,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-shell-enginemanager-deployment.yaml b/k8s/linkis-ujes-shell-enginemanager-deployment.yaml index 26dca0f4a4..890c014ade 100644 --- a/k8s/linkis-ujes-shell-enginemanager-deployment.yaml +++ b/k8s/linkis-ujes-shell-enginemanager-deployment.yaml @@ -54,11 +54,11 @@ spec: - node2 containers: - name: linkis-ujes-shell-enginemanager - image: zhangrong1027/linkis:linkis-ujes-shell-enginemanager-0.10.0 + image: wedatasphere/linkis:linkis-ujes-shell-enginemanager-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-shell-enginemanager/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-shell-enginemanager/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -85,11 +85,17 @@ spec: value: "20001" volumeMounts: - name: linkis-ujes-shell-enginemanager-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-shell-enginemanager/logs + mountPath: /opt/linkis/linkis-ujes-shell-enginemanager/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -105,4 +111,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-shell-entrance-deployment.yaml b/k8s/linkis-ujes-shell-entrance-deployment.yaml index a5ac719504..fa4710cf01 100644 --- a/k8s/linkis-ujes-shell-entrance-deployment.yaml +++ b/k8s/linkis-ujes-shell-entrance-deployment.yaml @@ -54,11 +54,11 @@ spec: - node2 containers: - name: linkis-ujes-shell-entrance - image: zhangrong1027/linkis:linkis-ujes-shell-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-shell-entrance-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-shell-entrance/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-shell-entrance/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -85,11 +85,17 @@ spec: value: "20000" volumeMounts: - name: linkis-ujes-shell-entrance-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-shell-entrance/logs + mountPath: /opt/linkis/linkis-ujes-shell-entrance/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -105,4 +111,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-spark-enginemanager-deployment.yaml b/k8s/linkis-ujes-spark-enginemanager-deployment.yaml index 544977eeea..d5923b68cd 100644 --- a/k8s/linkis-ujes-spark-enginemanager-deployment.yaml +++ b/k8s/linkis-ujes-spark-enginemanager-deployment.yaml @@ -55,11 +55,11 @@ spec: - node2 containers: - name: linkis-ujes-spark-enginemanager - image: zhangrong1027/linkis:linkis-ujes-spark-enginemanager-0.10.0 + image: wedatasphere/linkis:linkis-ujes-spark-enginemanager-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-spark-enginemanager/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-spark-enginemanager/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -86,11 +86,17 @@ spec: value: "21001" volumeMounts: - name: linkis-ujes-spark-enginemanager-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-spark-enginemanager/logs + mountPath: /opt/linkis/linkis-ujes-spark-enginemanager/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -106,4 +112,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/linkis-ujes-spark-entrance-deployment.yaml b/k8s/linkis-ujes-spark-entrance-deployment.yaml index 47b605863e..b3c783ce6d 100644 --- a/k8s/linkis-ujes-spark-entrance-deployment.yaml +++ b/k8s/linkis-ujes-spark-entrance-deployment.yaml @@ -54,11 +54,11 @@ spec: - node2 containers: - name: linkis-ujes-spark-entrance - image: zhangrong1027/linkis:linkis-ujes-spark-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-spark-entrance-0.10.0 lifecycle: preStop: exec: - command: ["sh","/opt/ihome/linkis-ujes-spark-entrance/bin/stop.sh"] + command: ["sh","/opt/linkis/linkis-ujes-spark-entrance/bin/stop.sh"] imagePullPolicy: Always ports: - name: http @@ -85,11 +85,17 @@ spec: value: "21000" volumeMounts: - name: linkis-ujes-spark-entrance-config - mountPath: /opt/ihome/conf + mountPath: /opt/linkis/conf # - name: resultset - # mountPath: /opt/ihome/data + # mountPath: /opt/linkis/data - name: varlog - mountPath: /opt/ihome/linkis-ujes-spark-entrance/logs + mountPath: /opt/linkis/linkis-ujes-spark-entrance/logs + - name: hadoop-config + mountPath: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + mountPath: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + mountPath: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf imagePullSecrets: - name: registry-key volumes: @@ -105,4 +111,13 @@ spec: path: /var/log - name: eureka-config configMap: - name: eureka-config \ No newline at end of file + name: eureka-config + - name: hadoop-config + hostPath: + path: /opt/hadoop/hadoop-2.7.7/etc/hadoop + - name: hive-config + hostPath: + path: /opt/hive/apache-hive-2.3.6-bin/conf + - name: spark-config + hostPath: + path: /opt/spark/spark-2.4.4-bin-hadoop2.7/conf diff --git a/k8s/package.sh b/k8s/package.sh new file mode 100644 index 0000000000..c58999817c --- /dev/null +++ b/k8s/package.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +mvn clean package -f bml/bmlserver/pom_k8s.xml + +mvn clean package -f datasource/datasourcemanager/server/pom_k8s.xml + +mvn clean package -f datasource/metadatamanager/server/pom_k8s.xml +mvn clean package -f datasource/metadatamanager/service/mysql/pom_k8s.xml +mvn clean package -f datasource/metadatamanager/service/elasticsearch/pom_k8s.xml +mvn clean package -f datasource/metadatamanager/service/hive/pom_k8s.xml + +mvn clean package -f gateway/gateway-ujes-support/pom_k8s.xml + +mvn clean package -f resourceManager/resourcemanagerserver/pom_k8s.xml + +mvn clean package -f contextservice/cs-server/pom_k8s.xml + +mvn clean package -f metadata/pom_k8s.xml + +mvn clean package -f publicService/pom_k8s.xml + +mvn clean package -f ujes/definedEngines/spark/enginemanager/pom_k8s.xml +mvn clean package -f ujes/definedEngines/spark/entrance/pom_k8s.xml + +mvn clean package -f ujes/definedEngines/hive/enginemanager/pom_k8s.xml +mvn clean package -f ujes/definedEngines/hive/entrance/pom_k8s.xml + +mvn clean package -f ujes/definedEngines/python/enginemanager/pom_k8s.xml +mvn clean package -f ujes/definedEngines/python/entrance/pom_k8s.xml + +mvn clean package -f ujes/definedEngines/pipeline/enginemanager/pom_k8s.xml +mvn clean package -f ujes/definedEngines/pipeline/entrance/pom_k8s.xml + +mvn clean package -f ujes/definedEngines/jdbc/entrance/pom_k8s.xml + +mvn clean package -f ujes/definedEngines/mlsql/entrance/pom_k8s.xml + +mvn clean package -f ujes/definedEngines/shell/entrance/pom_k8s.xml +mvn clean package -f ujes/definedEngines/shell/enginemanager/pom_k8s.xml + diff --git a/k8s/push.sh b/k8s/push.sh new file mode 100644 index 0000000000..49464f74a9 --- /dev/null +++ b/k8s/push.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +docker push $HARBOR_LINKIS/linkis:linkis-bml-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-dsm-server-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-mdm-server-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-mdm-service-mysql-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-mdm-service-es-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-mdm-service-hive-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-gateway-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-resourcemanager-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-cs-server-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-metadata-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-publicservice-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-ujes-spark-enginemanager-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-spark-entrance-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-ujes-hive-enginemanager-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-hive-entrance-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-ujes-python-enginemanager-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-python-entrance-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-enginemanager-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-entrance-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-ujes-jdbc-enginemanager-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-ujes-mlsql-entrance-0.10.0 + +docker push $HARBOR_LINKIS/linkis:linkis-ujes-shell-enginemanager-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-shell-entrance-0.10.0 + + diff --git a/k8s/register.yaml b/k8s/register.yaml index fc03717907..c4e9abe022 100644 --- a/k8s/register.yaml +++ b/k8s/register.yaml @@ -1,5 +1,5 @@ kubectl create secret docker-registry registry-key \ ---docker-server=https://zhangrong1027/linkis \ ---docker-username=admin \ +--docker-server=https://wedatasphere/linkis \ +--docker-username=wedatasphere \ --docker-password=***** \ ---docker-email=brian.rongzhang@gmail.com \ No newline at end of file +--docker-email=wedatasphere@webank.com \ No newline at end of file diff --git a/k8s/scriptis.yaml b/k8s/scriptis.yaml index b4c0757536..c27089ad74 100644 --- a/k8s/scriptis.yaml +++ b/k8s/scriptis.yaml @@ -52,7 +52,7 @@ spec: - node2 containers: - name: scriptis - image: zhangrong1027/linkis:scriptis + image: wedatasphere/linkis:scriptis imagePullPolicy: Always ports: - name: http @@ -78,4 +78,4 @@ spec: port: 80 protocol: TCP targetPort: 80 - clusterIP: None \ No newline at end of file + clusterIP: None diff --git a/metadata/Dockerfile b/metadata/Dockerfile index 21adb159ed..ccae9b5786 100644 --- a/metadata/Dockerfile +++ b/metadata/Dockerfile @@ -13,15 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 +FROM wedatasphere/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-metadata.zip /opt/ihome +COPY target/linkis-metadata.zip /opt/linkis RUN unzip linkis-metadata.zip -WORKDIR /opt/ihome/linkis-metadata/bin -ENTRYPOINT ["/opt/ihome/linkis-metadata/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-metadata/bin +ENTRYPOINT ["/opt/linkis/linkis-metadata/bin/startup.sh"] diff --git a/metadata/bin/startup.sh b/metadata/bin/startup.sh index d42fc9ec46..ad60c3fe84 100755 --- a/metadata/bin/startup.sh +++ b/metadata/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-metadata/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-metadata/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-metadata.log & diff --git a/pom.xml b/pom.xml index fd1b53f2d7..82f795792d 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ UTF-8 0.11.2 1.8.2 - zhangrong1027/linkis + wedatasphere/linkis diff --git a/publicService/Dockerfile b/publicService/Dockerfile index 41860ebe2a..f7d82be0aa 100644 --- a/publicService/Dockerfile +++ b/publicService/Dockerfile @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-publicservice.zip /opt/ihome +COPY target/linkis-publicservice.zip /opt/linkis RUN unzip linkis-publicservice.zip -WORKDIR /opt/ihome/linkis-publicservice/bin -ENTRYPOINT ["/opt/ihome/linkis-publicservice/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-publicservice/bin +ENTRYPOINT ["/opt/linkis/linkis-publicservice/bin/startup.sh"] diff --git a/publicService/bin/startup.sh b/publicService/bin/startup.sh index 9af42c822f..09c9036245 100755 --- a/publicService/bin/startup.sh +++ b/publicService/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-publicservice/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-publicservice/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-publicservice.log & diff --git a/resourceManager/resourcemanagerserver/Dockerfile b/resourceManager/resourcemanagerserver/Dockerfile index e5a928ba8e..47209bec32 100644 --- a/resourceManager/resourcemanagerserver/Dockerfile +++ b/resourceManager/resourcemanagerserver/Dockerfile @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-resourcemanager.zip /opt/ihome +COPY target/linkis-resourcemanager.zip /opt/linkis RUN unzip linkis-resourcemanager.zip -WORKDIR /opt/ihome/linkis-resourcemanager/bin -ENTRYPOINT ["/opt/ihome/linkis-resourcemanager/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-resourcemanager/bin +ENTRYPOINT ["/opt/linkis/linkis-resourcemanager/bin/startup.sh"] diff --git a/resourceManager/resourcemanagerserver/bin/startup.sh b/resourceManager/resourcemanagerserver/bin/startup.sh index 627d84125b..b74f8395be 100755 --- a/resourceManager/resourcemanagerserver/bin/startup.sh +++ b/resourceManager/resourcemanagerserver/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-resourcemanager/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-resourcemanager/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-resourcemanager.log & diff --git a/ujes/definedEngines/hive/enginemanager/Dockerfile b/ujes/definedEngines/hive/enginemanager/Dockerfile index fd18bbca18..81dedab2b3 100644 --- a/ujes/definedEngines/hive/enginemanager/Dockerfile +++ b/ujes/definedEngines/hive/enginemanager/Dockerfile @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-hive-enginemanager.zip /opt/ihome +COPY target/linkis-ujes-hive-enginemanager.zip /opt/linkis RUN unzip linkis-ujes-hive-enginemanager.zip -WORKDIR /opt/ihome/linkis-ujes-hive-enginemanager/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-hive-enginemanager/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-hive-enginemanager/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-hive-enginemanager/bin/startup.sh"] diff --git a/ujes/definedEngines/hive/enginemanager/bin/startup.sh b/ujes/definedEngines/hive/enginemanager/bin/startup.sh index 0fe3627d60..29e60bef12 100755 --- a/ujes/definedEngines/hive/enginemanager/bin/startup.sh +++ b/ujes/definedEngines/hive/enginemanager/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-hive-enginemanager/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-hive-enginemanager/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-hive-enginemanager.log & diff --git a/ujes/definedEngines/hive/entrance/Dockerfile b/ujes/definedEngines/hive/entrance/Dockerfile index b927e7bcbe..206c553334 100644 --- a/ujes/definedEngines/hive/entrance/Dockerfile +++ b/ujes/definedEngines/hive/entrance/Dockerfile @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-hive-entrance.zip /opt/ihome +COPY target/linkis-ujes-hive-entrance.zip /opt/linkis RUN unzip linkis-ujes-hive-entrance.zip -WORKDIR /opt/ihome/linkis-ujes-hive-entrance/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-hive-entrance/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-hive-entrance/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-hive-entrance/bin/startup.sh"] diff --git a/ujes/definedEngines/hive/entrance/bin/startup.sh b/ujes/definedEngines/hive/entrance/bin/startup.sh index 02bc27f6c8..4893804207 100755 --- a/ujes/definedEngines/hive/entrance/bin/startup.sh +++ b/ujes/definedEngines/hive/entrance/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-hive-entrance/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-hive-entrance/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-hive-entrance.log & diff --git a/ujes/definedEngines/jdbc/entrance/Dockerfile b/ujes/definedEngines/jdbc/entrance/Dockerfile index 10379ec0db..0bf11fbb98 100644 --- a/ujes/definedEngines/jdbc/entrance/Dockerfile +++ b/ujes/definedEngines/jdbc/entrance/Dockerfile @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-jdbc-entrance.zip /opt/ihome +COPY target/linkis-ujes-jdbc-entrance.zip /opt/linkis RUN unzip linkis-ujes-jdbc-entrance.zip -WORKDIR /opt/ihome/linkis-ujes-jdbc-entrance/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-jdbc-entrance/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-jdbc-entrance/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-jdbc-entrance/bin/startup.sh"] diff --git a/ujes/definedEngines/jdbc/entrance/bin/startup.sh b/ujes/definedEngines/jdbc/entrance/bin/startup.sh index 4f22b01574..e357813340 100755 --- a/ujes/definedEngines/jdbc/entrance/bin/startup.sh +++ b/ujes/definedEngines/jdbc/entrance/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-jdbc-entrance/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-jdbc-entrance/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-jdbc-entrance.log & diff --git a/ujes/definedEngines/mlsql/entrance/Dockerfile b/ujes/definedEngines/mlsql/entrance/Dockerfile index 3c064dcac0..52236633b0 100644 --- a/ujes/definedEngines/mlsql/entrance/Dockerfile +++ b/ujes/definedEngines/mlsql/entrance/Dockerfile @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-mlsql-entrance.zip /opt/ihome +COPY target/linkis-ujes-mlsql-entrance.zip /opt/linkis RUN unzip linkis-ujes-mlsql-entrance.zip -WORKDIR /opt/ihome/linkis-ujes-mlsql-entrance/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-mlsql-entrance/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-mlsql-entrance/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-mlsql-entrance/bin/startup.sh"] diff --git a/ujes/definedEngines/mlsql/entrance/bin/startup.sh b/ujes/definedEngines/mlsql/entrance/bin/startup.sh index ec1ca6569d..1040a98556 100755 --- a/ujes/definedEngines/mlsql/entrance/bin/startup.sh +++ b/ujes/definedEngines/mlsql/entrance/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-mlsql-entrance/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-mlsql-entrance/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-mlsql-entrance.log & diff --git a/ujes/definedEngines/pipeline/enginemanager/Dockerfile b/ujes/definedEngines/pipeline/enginemanager/Dockerfile index e4ad5cae48..4a6d9ebdc2 100644 --- a/ujes/definedEngines/pipeline/enginemanager/Dockerfile +++ b/ujes/definedEngines/pipeline/enginemanager/Dockerfile @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-pipeline-enginemanager.zip /opt/ihome +COPY target/linkis-ujes-pipeline-enginemanager.zip /opt/linkis RUN unzip linkis-ujes-pipeline-enginemanager.zip -WORKDIR /opt/ihome/linkis-ujes-pipeline-enginemanager/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-pipeline-enginemanager/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-pipeline-enginemanager/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-pipeline-enginemanager/bin/startup.sh"] diff --git a/ujes/definedEngines/pipeline/enginemanager/bin/startup.sh b/ujes/definedEngines/pipeline/enginemanager/bin/startup.sh index 1d6d6f0187..028a8c9be3 100755 --- a/ujes/definedEngines/pipeline/enginemanager/bin/startup.sh +++ b/ujes/definedEngines/pipeline/enginemanager/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujse-pipeline-enginemanager/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujse-pipeline-enginemanager/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-pipeline-enginemanager.log & diff --git a/ujes/definedEngines/pipeline/entrance/Dockerfile b/ujes/definedEngines/pipeline/entrance/Dockerfile index 1c59e86a1b..17a77e7cb9 100644 --- a/ujes/definedEngines/pipeline/entrance/Dockerfile +++ b/ujes/definedEngines/pipeline/entrance/Dockerfile @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-pipeline-entrance.zip /opt/ihome +COPY target/linkis-ujes-pipeline-entrance.zip /opt/linkis RUN unzip linkis-ujes-pipeline-entrance.zip -WORKDIR /opt/ihome/linkis-ujes-pipeline-entrance/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-pipeline-entrance/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-pipeline-entrance/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-pipeline-entrance/bin/startup.sh"] diff --git a/ujes/definedEngines/pipeline/entrance/bin/startup.sh b/ujes/definedEngines/pipeline/entrance/bin/startup.sh index 085b6db0e6..abe76c592d 100755 --- a/ujes/definedEngines/pipeline/entrance/bin/startup.sh +++ b/ujes/definedEngines/pipeline/entrance/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-pipeline-entrance/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-pipeline-entrance/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-pipline-entrance.log & diff --git a/ujes/definedEngines/python/enginemanager/Dockerfile b/ujes/definedEngines/python/enginemanager/Dockerfile index 3cd9b74b8b..51ae1ce897 100644 --- a/ujes/definedEngines/python/enginemanager/Dockerfile +++ b/ujes/definedEngines/python/enginemanager/Dockerfile @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-python-enginemanager.zip /opt/ihome +COPY target/linkis-ujes-python-enginemanager.zip /opt/linkis RUN unzip linkis-ujes-python-enginemanager.zip -WORKDIR /opt/ihome/linkis-ujes-python-enginemanager/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-python-enginemanager/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-python-enginemanager/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-python-enginemanager/bin/startup.sh"] diff --git a/ujes/definedEngines/python/enginemanager/bin/startup.sh b/ujes/definedEngines/python/enginemanager/bin/startup.sh index bb1c2cfd49..d4d684d7eb 100755 --- a/ujes/definedEngines/python/enginemanager/bin/startup.sh +++ b/ujes/definedEngines/python/enginemanager/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-python-enginemanager/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-python-enginemanager/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-python-enginemanager.log & diff --git a/ujes/definedEngines/python/entrance/Dockerfile b/ujes/definedEngines/python/entrance/Dockerfile index f357f4e35e..3613d0cbe0 100644 --- a/ujes/definedEngines/python/entrance/Dockerfile +++ b/ujes/definedEngines/python/entrance/Dockerfile @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-python-entrance.zip /opt/ihome +COPY target/linkis-ujes-python-entrance.zip /opt/linkis RUN unzip linkis-ujes-python-entrance.zip -WORKDIR /opt/ihome/linkis-ujes-python-entrance/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-python-entrance/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-python-entrance/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-python-entrance/bin/startup.sh"] diff --git a/ujes/definedEngines/python/entrance/bin/startup.sh b/ujes/definedEngines/python/entrance/bin/startup.sh index d7d62dd679..623526ef45 100755 --- a/ujes/definedEngines/python/entrance/bin/startup.sh +++ b/ujes/definedEngines/python/entrance/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-python-entrance/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-python-entrance/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-python-entrance.log & diff --git a/ujes/definedEngines/shell/enginemanager/Dockerfile b/ujes/definedEngines/shell/enginemanager/Dockerfile index 838f876ab6..3dd9c411d2 100644 --- a/ujes/definedEngines/shell/enginemanager/Dockerfile +++ b/ujes/definedEngines/shell/enginemanager/Dockerfile @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-shell-enginemanager.zip /opt/ihome +COPY target/linkis-ujes-shell-enginemanager.zip /opt/linkis RUN unzip linkis-ujes-shell-enginemanager.zip -WORKDIR /opt/ihome/linkis-ujes-shell-enginemanager/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-shell-enginemanager/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-shell-enginemanager/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-shell-enginemanager/bin/startup.sh"] diff --git a/ujes/definedEngines/shell/enginemanager/bin/startup.sh b/ujes/definedEngines/shell/enginemanager/bin/startup.sh index 5ed89b20c0..9c181cbeb3 100755 --- a/ujes/definedEngines/shell/enginemanager/bin/startup.sh +++ b/ujes/definedEngines/shell/enginemanager/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-shell-enginemanager/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-shell-enginemanager/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-shell-enginemanager.log & diff --git a/ujes/definedEngines/shell/entrance/Dockerfile b/ujes/definedEngines/shell/entrance/Dockerfile index 13a0ed5ead..7dd3ba8b38 100644 --- a/ujes/definedEngines/shell/entrance/Dockerfile +++ b/ujes/definedEngines/shell/entrance/Dockerfile @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-shell-entrance.zip /opt/ihome +COPY target/linkis-ujes-shell-entrance.zip /opt/linkis RUN unzip linkis-ujes-shell-entrance.zip -WORKDIR /opt/ihome/linkis-ujes-shell-entrance/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-shell-entrance/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-shell-entrance/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-shell-entrance/bin/startup.sh"] diff --git a/ujes/definedEngines/shell/entrance/bin/startup.sh b/ujes/definedEngines/shell/entrance/bin/startup.sh index cd19743172..75dc8762a8 100755 --- a/ujes/definedEngines/shell/entrance/bin/startup.sh +++ b/ujes/definedEngines/shell/entrance/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-shell-entrance/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-shell-entrance/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-shell-entrance.log & diff --git a/ujes/definedEngines/spark/enginemanager/Dockerfile b/ujes/definedEngines/spark/enginemanager/Dockerfile index 6fef136b1f..37842e5679 100644 --- a/ujes/definedEngines/spark/enginemanager/Dockerfile +++ b/ujes/definedEngines/spark/enginemanager/Dockerfile @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-spark-enginemanager.zip /opt/ihome +COPY target/linkis-ujes-spark-enginemanager.zip /opt/linkis RUN unzip linkis-ujes-spark-enginemanager.zip -WORKDIR /opt/ihome/linkis-ujes-spark-enginemanager/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-spark-enginemanager/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-spark-enginemanager/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-spark-enginemanager/bin/startup.sh"] diff --git a/ujes/definedEngines/spark/enginemanager/bin/startup.sh b/ujes/definedEngines/spark/enginemanager/bin/startup.sh index 5ba28e8017..e5940a8059 100755 --- a/ujes/definedEngines/spark/enginemanager/bin/startup.sh +++ b/ujes/definedEngines/spark/enginemanager/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-spark-enginemanager/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-spark-enginemanager/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-spark-enginemanage.log & diff --git a/ujes/definedEngines/spark/entrance/Dockerfile b/ujes/definedEngines/spark/entrance/Dockerfile index 1076727889..314e17f02e 100644 --- a/ujes/definedEngines/spark/entrance/Dockerfile +++ b/ujes/definedEngines/spark/entrance/Dockerfile @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM zhangrong1027/linkis:emr-base-spark2.4.4 -MAINTAINER brian.rongzhang@gmail.com +FROM wedatasphere/linkis:emr-base-spark2.4.4 +MAINTAINER wedatasphere@webank.com RUN yum install -y unzip -WORKDIR /opt/ihome +WORKDIR /opt/linkis -COPY target/linkis-ujes-spark-entrance.zip /opt/ihome +COPY target/linkis-ujes-spark-entrance.zip /opt/linkis RUN unzip linkis-ujes-spark-entrance.zip -WORKDIR /opt/ihome/linkis-ujes-spark-entrance/bin -ENTRYPOINT ["/opt/ihome/linkis-ujes-spark-entrance/bin/startup.sh"] \ No newline at end of file +WORKDIR /opt/linkis/linkis-ujes-spark-entrance/bin +ENTRYPOINT ["/opt/linkis/linkis-ujes-spark-entrance/bin/startup.sh"] diff --git a/ujes/definedEngines/spark/entrance/bin/startup.sh b/ujes/definedEngines/spark/entrance/bin/startup.sh index 29ced580f1..488dd8249a 100755 --- a/ujes/definedEngines/spark/entrance/bin/startup.sh +++ b/ujes/definedEngines/spark/entrance/bin/startup.sh @@ -32,7 +32,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -cp -f /opt/ihome/conf/linkis.properties /opt/ihome/linkis-ujes-spark-entrance/conf +cp -f /opt/linkis/conf/linkis.properties /opt/linkis/linkis-ujes-spark-entrance/conf nohup java $SERVER_JAVA_OPTS -Deurekaurl=$EUREKA_URL -Duser.timezone=Asia/Shanghai -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS --server.port=$START_PORT 2>&1 > $SERVER_LOG_PATH/linkis-ujes-spark-entrance.log &