Merge pull request #109 from andrewshan/main

feat: refactor all deploy scripts into deploy folder
polarismesh · Sep 29, 2021 · 67dbf6f · 67dbf6f
2 parents 3c04b67 + cac5bbb
commit 67dbf6f
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/standalone.yml b/.github/workflows/standalone.yml
@@ -42,15 +42,15 @@ jobs:
         run: |
           if [ ${GOOS} == "kubernetes" ];then
             set -e
-            cd standalone
+            cd deploy/standalone
             DIR_NAME=polaris-standalone-release_${SERVER_VERSION}.${GOOS}
             mkdir ${DIR_NAME}
             pushd ${DIR_NAME}
-            cp ../installk8s/* ./
+            cp ../k8s/* ./
             popd
           else
             set -e
-            cd standalone
+            cd deploy/standalone
             POLARIS_GIT_PATH=https://github.com/polarismesh
             DIR_NAME=polaris-standalone-release_${SERVER_VERSION}.${GOOS}.${GOARCH}
             mkdir ${DIR_NAME}
@@ -62,15 +62,15 @@ jobs:
             if [ ${GOOS} == "windows" ];then
             wget -T10 -t3 https://github.com/prometheus/prometheus/releases/download/v2.28.0/prometheus-2.28.0.${GOOS}-${GOARCH}.zip
             wget -T10 -t3 https://github.com/prometheus/pushgateway/releases/download/v1.4.1/pushgateway-1.4.1.${GOOS}-${GOARCH}.zip
-            mv ../installvm/install-windows.bat ./install.bat
-            mv ../installvm/install-windows.ps1 ./install-windows.ps1
-            mv ../installvm/uninstall-windows.bat ./uninstall.bat
-            mv ../installvm/uninstall-windows.ps1 ./uninstall-windows.ps1
+            mv ../vm/install-windows.bat ./install.bat
+            mv ../vm/install-windows.ps1 ./install-windows.ps1
+            mv ../vm/uninstall-windows.bat ./uninstall.bat
+            mv ../vm/uninstall-windows.ps1 ./uninstall-windows.ps1
             else
             wget -T10 -t3 https://github.com/prometheus/prometheus/releases/download/v2.28.0/prometheus-2.28.0.${GOOS}-${GOARCH}.tar.gz
             wget -T10 -t3 https://github.com/prometheus/pushgateway/releases/download/v1.4.1/pushgateway-1.4.1.${GOOS}-${GOARCH}.tar.gz
-            mv ../installvm/install-${GOOS}.sh ./install.sh
-            mv ../installvm/uninstall-${GOOS}.sh ./uninstall.sh
+            mv ../vm/install-${GOOS}.sh ./install.sh
+            mv ../vm/uninstall-${GOOS}.sh ./uninstall.sh
             fi
             popd
           fi

diff --git a/deploy/cluster/vm/README.md b/deploy/cluster/vm/README.md
@@ -0,0 +1 @@
+Scripts to deploy cluster version to kubernetes
diff --git a/...installk8s/00-polaris-console-config.yaml → ...dalone/k8s/00-polaris-console-config.yaml b/...installk8s/00-polaris-console-config.yaml → ...dalone/k8s/00-polaris-console-config.yaml
diff --git a/.../installk8s/01-polaris-server-config.yaml → ...ndalone/k8s/01-polaris-server-config.yaml b/.../installk8s/01-polaris-server-config.yaml → ...ndalone/k8s/01-polaris-server-config.yaml
diff --git a/standalone/installk8s/02-polaris-server.yaml → deploy/standalone/k8s/02-polaris-server.yaml b/standalone/installk8s/02-polaris-server.yaml → deploy/standalone/k8s/02-polaris-server.yaml
diff --git a/standalone/installk8s/03-prometheus.yaml → deploy/standalone/k8s/03-prometheus.yaml b/standalone/installk8s/03-prometheus.yaml → deploy/standalone/k8s/03-prometheus.yaml
diff --git a/standalone/installvm/install-darwin.sh → deploy/standalone/vm/install-darwin.sh b/standalone/installvm/install-darwin.sh → deploy/standalone/vm/install-darwin.sh
diff --git a/standalone/installvm/install-linux.sh → deploy/standalone/vm/install-linux.sh b/standalone/installvm/install-linux.sh → deploy/standalone/vm/install-linux.sh
diff --git a/standalone/installvm/install-windows.bat → deploy/standalone/vm/install-windows.bat b/standalone/installvm/install-windows.bat → deploy/standalone/vm/install-windows.bat
diff --git a/standalone/installvm/install-windows.ps1 → deploy/standalone/vm/install-windows.ps1 b/standalone/installvm/install-windows.ps1 → deploy/standalone/vm/install-windows.ps1
diff --git a/standalone/installvm/uninstall-darwin.sh → deploy/standalone/vm/uninstall-darwin.sh b/standalone/installvm/uninstall-darwin.sh → deploy/standalone/vm/uninstall-darwin.sh
diff --git a/standalone/installvm/uninstall-linux.sh → deploy/standalone/vm/uninstall-linux.sh b/standalone/installvm/uninstall-linux.sh → deploy/standalone/vm/uninstall-linux.sh
diff --git a/standalone/installvm/uninstall-windows.bat → deploy/standalone/vm/uninstall-windows.bat b/standalone/installvm/uninstall-windows.bat → deploy/standalone/vm/uninstall-windows.bat
diff --git a/standalone/installvm/uninstall-windows.ps1 → deploy/standalone/vm/uninstall-windows.ps1 b/standalone/installvm/uninstall-windows.ps1 → deploy/standalone/vm/uninstall-windows.ps1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Scripts to deploy cluster version to kubernetes