You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by le...@apache.org on 2023/04/03 10:39:47 UTC
[linkis] branch dev-1.4.0 updated: [Feature] Change KIND to an optional way on kubernetes deployment (#4427)
This is an automated email from the ASF dual-hosted git repository.
legendtkl pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
new 5b321e055 [Feature] Change KIND to an optional way on kubernetes deployment (#4427)
5b321e055 is described below
commit 5b321e055977d5aefcb4cac5e7298589145819e2
Author: Cheng'hui Chen <27...@users.noreply.github.com>
AuthorDate: Mon Apr 3 18:39:39 2023 +0800
[Feature] Change KIND to an optional way on kubernetes deployment (#4427)
* feat: support kubernetes deploy ment without KIND dependency
* feat: support kubernetes deploy ment without KIND dependency
* feat: support kubernetes deploy ment without KIND dependency
* feat: support kubernetes deploy ment without KIND dependency
---
linkis-dist/bin/install-linkis-to-kubernetes.sh | 77 +++++++++++++---------
linkis-dist/helm/scripts/common.sh | 2 +-
.../helm/scripts/install-charts-with-ldh.sh | 3 +-
linkis-dist/helm/scripts/install-charts.sh | 3 +-
linkis-dist/helm/scripts/install-ldh.sh | 2 +-
linkis-dist/helm/scripts/install-linkis.sh | 5 +-
linkis-dist/helm/scripts/install-mysql.sh | 2 +-
7 files changed, 56 insertions(+), 38 deletions(-)
diff --git a/linkis-dist/bin/install-linkis-to-kubernetes.sh b/linkis-dist/bin/install-linkis-to-kubernetes.sh
index c1007d3a9..1beba6ee5 100644
--- a/linkis-dist/bin/install-linkis-to-kubernetes.sh
+++ b/linkis-dist/bin/install-linkis-to-kubernetes.sh
@@ -22,7 +22,9 @@ TAG="latest"
COMMAND="pull-install"
DEBUG=false
WITH_LDH=false
-
+USING_KIND=false
+KUBE_NAMESPACE="linkis"
+HELM_RELEASE_NAME="linkis-demo"
debug(){
if [ $DEBUG = true ]; then
@@ -37,18 +39,21 @@ info(){
#help info
help() {
- echo "Command Describe"
- echo "pull-install pull and install linkis images"
- echo "install pull linkis images"
- echo "pull pull linkis images"
- echo "reset delete the test-helm cluster of kind"
- echo "help print help info"
+ echo "Command Describe"
+ echo "pull-install pull and install linkis images"
+ echo "install install linkis images"
+ echo "pull pull linkis images"
+ echo "reset delete the test-helm cluster of kind"
+ echo "help print help info"
echo ""
- echo "Params Describe"
- echo "-m url (default:ghcr.io , eg: ghcr.dockerproxy.com)"
- echo "-d print debug info"
- echo "-l install linkis with ldh"
- echo "-t tag name "
+ echo "Params Describe"
+ echo "-d print debug info (default: false)"
+ echo "-m mirror url (default:ghcr.io , eg: ghcr.dockerproxy.com)"
+ echo "-t tag name (default:latest)"
+ echo "-n install linkis with ldh (default:false)"
+ echo "-r install linkis with ldh (default:false)"
+ echo "-n kubernetes namespace (default:linkis)"
+ echo "--helm-release helm release name (default:linkis-demo)"
echo ""
echo "example:"
echo "./install-linkis-to-kubernetes.sh pull pull image with ghcr.io"
@@ -60,8 +65,10 @@ help() {
#pull the container image of the linkis
pull(){
- debug ${MIRRORS}/apache/linkis/linkis-ldh:${TAG}
- docker pull ${MIRRORS}/apache/linkis/linkis-ldh:${TAG}
+ if [ $WITH_LDH = true ]; then
+ debug ${MIRRORS}/apache/linkis/linkis-ldh:${TAG}
+ docker pull ${MIRRORS}/apache/linkis/linkis-ldh:${TAG}
+ fi
debug ${MIRRORS}/apache/linkis/linkis:${TAG}
docker pull ${MIRRORS}/apache/linkis/linkis:${TAG}
debug ${MIRRORS}/apache/linkis/linkis-web:${TAG}
@@ -71,7 +78,9 @@ pull(){
tag(){
docker tag ${MIRRORS}/apache/linkis/linkis:${TAG} linkis:dev
docker tag ${MIRRORS}/apache/linkis/linkis-web:${TAG} linkis-web:dev
- docker tag ${MIRRORS}/apache/linkis/linkis-ldh:${TAG} linkis-ldh:dev
+ if [ $WITH_LDH = true ]; then
+ docker tag ${MIRRORS}/apache/linkis/linkis-ldh:${TAG} linkis-ldh:dev
+ fi
}
#create an image to carry mysql
make_linikis_image_with_mysql_jdbc(){
@@ -88,14 +97,16 @@ install_mysql(){
}
#ldh installation
install_ldh(){
- ${ROOT_DIR}/helm/scripts/install-ldh.sh
+ if [ $WITH_LDH = true ]; then
+ ${ROOT_DIR}/helm/scripts/install-ldh.sh
+ fi
}
#linkis installation
install_linkis(){
if [ $WITH_LDH = true ];then
- ${ROOT_DIR}/helm/scripts/install-charts-with-ldh.sh
+ ${ROOT_DIR}/helm/scripts/install-charts-with-ldh.sh $KUBE_NAMESPACE $HELM_RELEASE_NAME $USING_KIND
else
- ${ROOT_DIR}/helm/scripts/install-linkis.sh
+ ${ROOT_DIR}/helm/scripts/install-linkis.sh $KUBE_NAMESPACE $HELM_RELEASE_NAME true $USING_KIND
fi
}
#display pods
@@ -104,9 +115,11 @@ display_pods(){
}
install(){
- tag
- make_linikis_image_with_mysql_jdbc
- create_kind_cluster
+ if [ $USING_KIND = true ]; then
+ tag
+ make_linikis_image_with_mysql_jdbc
+ create_kind_cluster
+ fi
install_mysql
install_ldh
install_linkis
@@ -117,7 +130,6 @@ reset(){
kind delete clusters test-helm
}
-
check_docker(){
docker -v >> /dev/null 2>&1
if [ $? -ne 0 ]; then
@@ -156,15 +168,9 @@ debug $WORK_DIR
#entrance to the program
main(){
- #environmental testing
- check_docker
- check_kind
- check_kubectl
- check_helm
-
#argument parsing
long_opts="debug,mirrors:"
- getopt_cmd=$(getopt -o dm:lt: -n $(basename $0) -- "$@") || \
+ getopt_cmd=$(getopt -o dm:lt:kn: -l helm-release: -n $(basename $0) -- "$@") || \
{ echo -e "\nERROR: Getopt failed. Extra args\n"; exit 1;}
eval set -- "$getopt_cmd"
@@ -172,13 +178,24 @@ main(){
case "$1" in
-d) DEBUG=true;;
-m) MIRRORS=$2;;
- -l) WITH_LDH=true;;
-t) TAG=$2;;
+ -l) WITH_LDH=true;;
+ -k) USING_KIND=true;;
+ -n) KUBE_NAMESPACE=$2;;
+ --helm-release) HELM_RELEASE_NAME=$2;;
--) shift; break;;
esac
shift
done
+ #environmental testing
+ check_docker
+ check_kubectl
+ check_helm
+ if [ $USING_KIND = true ];then
+ check_kind
+ fi
+
debug "params num:"$#
#command parsing
diff --git a/linkis-dist/helm/scripts/common.sh b/linkis-dist/helm/scripts/common.sh
index 546cf2ebe..8844ea7b2 100755
--- a/linkis-dist/helm/scripts/common.sh
+++ b/linkis-dist/helm/scripts/common.sh
@@ -22,7 +22,7 @@ RESOURCE_DIR=${WORK_DIR}/resources
CHARTS_DIR_ROOT=${WORK_DIR}/../charts
LINKIS_CHART_DIR=${CHARTS_DIR_ROOT}/linkis
-KIND_LOAD_IMAGE=${KIND_LOAD_IMAGE:-true}
+USING_KIND=${USING_KIND:-false}
KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-test-helm}
LINKIS_IMAGE_TAG=${LINKIS_IMAGE_TAG:-dev}
diff --git a/linkis-dist/helm/scripts/install-charts-with-ldh.sh b/linkis-dist/helm/scripts/install-charts-with-ldh.sh
index 1ca8a20aa..b2757bcc0 100755
--- a/linkis-dist/helm/scripts/install-charts-with-ldh.sh
+++ b/linkis-dist/helm/scripts/install-charts-with-ldh.sh
@@ -21,7 +21,8 @@ WORK_DIR=`cd $(dirname $0); pwd -P`
KUBE_NAMESPACE=${1:-linkis}
HELM_RELEASE_NAME=${2:-linkis-demo}
+USING_KIND=${3:-false}
-sh ${WORK_DIR}/install-linkis.sh ${KUBE_NAMESPACE} ${HELM_RELEASE_NAME} false
+sh ${WORK_DIR}/install-linkis.sh ${KUBE_NAMESPACE} ${HELM_RELEASE_NAME} false ${USING_KIND}
kubectl apply -n ${KUBE_NAMESPACE} -f ${RESOURCE_DIR}/ldh/configmaps
diff --git a/linkis-dist/helm/scripts/install-charts.sh b/linkis-dist/helm/scripts/install-charts.sh
index 38d00d1d0..c10202bd0 100755
--- a/linkis-dist/helm/scripts/install-charts.sh
+++ b/linkis-dist/helm/scripts/install-charts.sh
@@ -21,5 +21,6 @@ WORK_DIR=`cd $(dirname $0); pwd -P`
KUBE_NAMESPACE=${1:-linkis}
HELM_RELEASE_NAME=${2:-linkis-demo}
+USING_KIND=${3:-false}
-sh ${WORK_DIR}/install-linkis.sh ${KUBE_NAMESPACE} ${HELM_RELEASE_NAME} true
+sh ${WORK_DIR}/install-linkis.sh ${KUBE_NAMESPACE} ${HELM_RELEASE_NAME} true ${USING_KIND}
diff --git a/linkis-dist/helm/scripts/install-ldh.sh b/linkis-dist/helm/scripts/install-ldh.sh
index 40ee93096..af6b4c2de 100755
--- a/linkis-dist/helm/scripts/install-ldh.sh
+++ b/linkis-dist/helm/scripts/install-ldh.sh
@@ -25,7 +25,7 @@ LDH_VERSION=${LDH_VERSION-${LINKIS_IMAGE_TAG}}
echo "# LDH version: ${LINKIS_IMAGE_TAG}"
# load image
-if [ "X${KIND_LOAD_IMAGE}" == "Xtrue" ]; then
+if [ "X${USING_KIND}" == "Xtrue" ]; then
echo "# Loading LDH image ..."
kind load docker-image linkis-ldh:${LINKIS_IMAGE_TAG} --name ${KIND_CLUSTER_NAME}
fi
diff --git a/linkis-dist/helm/scripts/install-linkis.sh b/linkis-dist/helm/scripts/install-linkis.sh
index 75abd25ac..2abf12a0d 100755
--- a/linkis-dist/helm/scripts/install-linkis.sh
+++ b/linkis-dist/helm/scripts/install-linkis.sh
@@ -22,8 +22,7 @@ WORK_DIR=`cd $(dirname $0); pwd -P`
KUBE_NAMESPACE=${1:-linkis}
HELM_RELEASE_NAME=${2:-linkis-demo}
LOCAL_MODE=${3:-true}
-
-. ${WORK_DIR}/common.sh
+USING_KIND=${4:-false}
if [ "X${HELM_DEBUG}" == "Xtrue" ]; then
# template helm charts
@@ -34,7 +33,7 @@ else
kubectl apply -n ${KUBE_NAMESPACE} -f ${RESOURCE_DIR}/ldh/configmaps
fi
# load image
- if [ "X${KIND_LOAD_IMAGE}" == "Xtrue" ]; then
+ if [ "X${USING_KIND}" == "Xtrue" ]; then
echo "# Loading Linkis image ..."
kind load docker-image linkis:${LINKIS_IMAGE_TAG} --name ${KIND_CLUSTER_NAME}
kind load docker-image linkis-web:${LINKIS_IMAGE_TAG} --name ${KIND_CLUSTER_NAME}
diff --git a/linkis-dist/helm/scripts/install-mysql.sh b/linkis-dist/helm/scripts/install-mysql.sh
index acb1be725..07e35678b 100755
--- a/linkis-dist/helm/scripts/install-mysql.sh
+++ b/linkis-dist/helm/scripts/install-mysql.sh
@@ -24,7 +24,7 @@ MYSQL_VERSION=${MYSQL_VERSION:-5.7}
set -e
# load image
-if [ "X${KIND_LOAD_IMAGE}" == "Xtrue" ]; then
+if [ "X${USING_KIND}" == "Xtrue" ]; then
echo "# Loading MySQL image ..."
kind load docker-image mysql:${MYSQL_VERSION} --name ${KIND_CLUSTER_NAME}
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org