* update k3s installation scripts for improved datastore handling

Author: ysicing

common/const.go

@@ -161,7 +161,7 @@ ExecStart=/usr/local/bin/k3s \
       {{- if .DataStore }}
         {{- if ne .DataStore "local"}}
         --datastore-endpoint {{ .DataStore }} \
-        {{-end}}
+        {{- end}}
       {{- else}}
         --cluster-init \
         --etcd-expose-metrics \
@@ -176,7 +176,7 @@ ExecStart=/usr/local/bin/k3s \
     {{- else}}
       agent \
     {{- end }}
-      {{if not .Master0 -}}
+      {{if not .Master0 }}
         --server https://{{ .KubeAPI }}:6443 \
       {{ end }}
         --token {{ .KubeToken }} \

hack/scripts/devops/devops.sh

@@ -51,6 +51,10 @@
 #   - USEPHP7
 #     Use PHP7 when install Zentao DevOPS.
 #     Defaults to 'false'
+#   - DATASTORE
+#     Use datastore when install k3s cluster.
+#     Defaults to '', support 'local(sqlite)', default use etcd as datastore
+#     If STORAGE_TYPE is 'local', use 'sqlite(local)' as datastore
 
 set -e
 set -o noglob
@@ -235,6 +239,9 @@ install_zentao_devops() {
     if [ -n "${STORAGE_PATH}" ]; then
       INSTALL_COMMAND="${INSTALL_COMMAND} --storage-path ${STORAGE_PATH}"
     fi
+    if [ -z "${DATASTORE}" ]; then
+      export DATASTORE="local"
+    fi
   fi
   if [ -n "${EX_DB_HOST}" ] && [ -n "${EX_DB_PASSWORD}" ]; then
     INSTALL_COMMAND="${INSTALL_COMMAND} --ext-db-host ${EX_DB_HOST} --ext-db-password ${EX_DB_PASSWORD}"
@@ -248,6 +255,9 @@ install_zentao_devops() {
   if [ -n "${USEPHP7}" ] && [ "$(echo "${USEPHP7}" | tr '[:upper:]' '[:lower:]')" != "false" ]; then
     INSTALL_COMMAND="${INSTALL_COMMAND} --use-php7"
   fi
+  if [ -n "${DATASTORE}" ]; then
+    INSTALL_COMMAND="${INSTALL_COMMAND} --datastore ${DATASTORE}"
+  fi
   if [ -n "${DEBUG}" ]; then
     INSTALL_COMMAND="${INSTALL_COMMAND} --debug"
   fi

hack/scripts/devops/install.sh

@@ -51,6 +51,10 @@
 #   - USEPHP7
 #     Use PHP7 when install Zentao DevOPS.
 #     Defaults to 'false'
+#   - DATASTORE
+#     Use datastore when install k3s cluster.
+#     Defaults to '', support 'local(sqlite)', default use etcd as datastore
+#     If STORAGE_TYPE is 'local', use 'sqlite(local)' as datastore
 
 set -e
 set -o noglob

internal/pkg/cli/k3stpl/k3stpl.go

@@ -91,7 +91,7 @@ func EmbedCommand(f factory.Factory) *cobra.Command {
 	rootCmd.Flags().StringVar(&k3sargs.PodCIDR, "pod-cidr", common.DefaultClusterPodCidr, "cluster cidr")
 	rootCmd.Flags().StringVar(&k3sargs.ServiceCIDR, "service-cidr", common.DefaultClusterServiceCidr, "service cidr")
 	rootCmd.Flags().StringVar(&k3sargs.DataDir, "data-dir", "", "data dir")
-	rootCmd.Flags().StringVar(&k3sargs.DataStore, "data", "", "data type")
+	rootCmd.Flags().StringVar(&k3sargs.DataStore, "datastore", "", "datastore")
 	rootCmd.Flags().StringVar(&k3sargs.KubeAPI, "kubeapi", "", "kubeapi")
 	rootCmd.Flags().BoolVar(&k3sargs.TypeMaster, "master", true, "master type")
 	rootCmd.Flags().BoolVar(&k3sargs.Master0, "master0", false, "master0")