diff --git a/.github/workflows/docker-standalone.yml b/.github/workflows/docker-standalone.yml
index d5bc34720..167740edb 100644
--- a/.github/workflows/docker-standalone.yml
+++ b/.github/workflows/docker-standalone.yml
@@ -9,6 +9,9 @@ on:
console_version:
description: "tag version for polaris-console"
required: true
+ limiter_version:
+ description: "tag version for polaris-limiter"
+ required: true
jobs:
release:
@@ -47,12 +50,13 @@ jobs:
GOARCH: ${{ matrix.goarch }}
SERVER_VERSION: ${{ github.event.inputs.server_version }}
CONSOLE_VERSION: ${{ github.event.inputs.console_version }}
+ LIMITER_VERSION: ${{ github.event.inputs.limiter_version }}
run: |
set -e
cd deploy/standalone
-
+
POLARIS_GIT_PATH=https://github.com/polarismesh
-
+
DIR_NAME=polaris-standalone-release_${SERVER_VERSION}.${GOOS}
rm -rf ${DIR_NAME}
mkdir ${DIR_NAME}
@@ -66,6 +70,8 @@ jobs:
wget -T10 -t3 ${POLARIS_GIT_PATH}/polaris/releases/download/${SERVER_VERSION}/${SERVER_PKG_NAME} --no-check-certificate
CONSOLE_PKG_NAME=polaris-console-release_${CONSOLE_VERSION}.${GOOS}.${GOARCH}.zip
wget -T10 -t3 ${POLARIS_GIT_PATH}/polaris-console/releases/download/${CONSOLE_VERSION}/${CONSOLE_PKG_NAME} --no-check-certificate
+ LIMITER_PKG_NAME=polaris-limiter-release_${LIMITER_VERSION}.${GOOS}.${GOARCH}.zip
+ wget -T10 -t3 ${POLARIS_GIT_PATH}/polaris-limiter/releases/download/${LIMITER_VERSION}/${LIMITER_PKG_NAME} --no-check-certificate
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
@@ -74,12 +80,13 @@ jobs:
done
platforms=${platforms::-1}
-
+
cp ../vm/install-${GOOS}.sh ./install.sh
cp ../vm/uninstall-${GOOS}.sh ./uninstall.sh
+ cp ../vm/prometheus-help.sh ./prometheus-help.sh
cp ../vm/port.properties ./port.properties
cp ../vm/Dockerfile ./Dockerfile
-
+
echo "#!/bin/bash" >"run.sh"
echo "" >>"run.sh"
echo "bash install.sh" >>"run.sh"
@@ -87,9 +94,9 @@ jobs:
echo "do" >>"run.sh"
echo " sleep 1" >>"run.sh"
echo "done" >>"run.sh"
-
+
docker_repository="polarismesh"
docker_image="polaris-server-standalone"
docker_tag=${SERVER_VERSION}
-
- docker buildx build --network=host --build-arg SERVER_VERSION="${SERVER_VERSION}" --build-arg CONSOLE_VERSION="${CONSOLE_VERSION}" -t ${docker_repository}/${docker_image}:${docker_tag} -t ${docker_repository}/${docker_image}:latest --platform ${platforms} --push ./
+
+ docker buildx build --network=host --build-arg SERVER_VERSION="${SERVER_VERSION}" --build-arg CONSOLE_VERSION="${CONSOLE_VERSION}" --build-arg LIMITER_VERSION="${LIMITER_VERSION}" -t ${docker_repository}/${docker_image}:${docker_tag} -t ${docker_repository}/${docker_image}:latest --platform ${platforms} --push ./
diff --git a/README-zh.md b/README-zh.md
index b3969c9eb..b065bd320 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -2,8 +2,10 @@
[](https://github.com/PolarisMesh/polaris/actions/workflows/codecov.yaml)
[](https://codecov.io/gh/polarismesh/polaris?branch=main)
+[](https://hub.docker.com/repository/docker/polarismesh/polaris-server/general)
[](https://github.com/polarismesh/polaris/graphs/contributors)
[](https://opensource.org/licenses/BSD-3-Clause)
+[](https://github.com/polarismesh/polaris)
diff --git a/README.md b/README.md
index f08af2a62..c528e6288 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,10 @@
[](https://github.com/PolarisMesh/polaris/actions/workflows/codecov.yaml)
[](https://codecov.io/gh/polarismesh/polaris?branch=main)
+[](https://hub.docker.com/repository/docker/polarismesh/polaris-server/general)
[](https://github.com/polarismesh/polaris/graphs/contributors)
[](https://opensource.org/licenses/BSD-3-Clause)
+[](https://github.com/polarismesh/polaris)
diff --git a/deploy/helm/templates/polaris-server-config.yaml b/deploy/helm/templates/polaris-server-config.yaml
index 874ddafb7..5281ae9df 100644
--- a/deploy/helm/templates/polaris-server-config.yaml
+++ b/deploy/helm/templates/polaris-server-config.yaml
@@ -135,6 +135,7 @@ data:
listenIP: "0.0.0.0"
listenPort: {{ .Values.service.httpPort }}
enablePprof: true # debug pprof
+ enableSwagger: true
connLimit:
openConnLimit: false
maxConnPerHost: 128
diff --git a/deploy/standalone/docker-compose/server/polaris-server.yaml b/deploy/standalone/docker-compose/server/polaris-server.yaml
index 70c897f33..ba9882178 100644
--- a/deploy/standalone/docker-compose/server/polaris-server.yaml
+++ b/deploy/standalone/docker-compose/server/polaris-server.yaml
@@ -57,6 +57,28 @@ bootstrap:
# - stdout
# errorOutputPaths:
# - stderr
+ healthcheck:
+ rotateOutputPath: log/polaris-healthcheck.log
+ errorRotateOutputPath: log/polaris-healthcheck-error.log
+ rotationMaxSize: 100
+ rotationMaxBackups: 10
+ rotationMaxAge: 7
+ outputLevel: info
+ # outputPaths:
+ # - stdout
+ # errorOutputPaths:
+ # - stderr
+ xdsv3:
+ rotateOutputPath: log/polaris-xdsv3.log
+ errorRotateOutputPath: log/polaris-xdsv3-error.log
+ rotationMaxSize: 100
+ rotationMaxBackups: 10
+ rotationMaxAge: 7
+ outputLevel: info
+ # outputPaths:
+ # - stdout
+ # errorOutputPaths:
+ # - stderr
default:
rotateOutputPath: log/polaris-default.log
errorRotateOutputPath: log/polaris-default-error.log
@@ -104,6 +126,7 @@ apiservers:
listenIP: "0.0.0.0"
listenPort: 8090
enablePprof: true # debug pprof
+ enableSwagger: true # debug pprof
connLimit:
openConnLimit: false
maxConnPerHost: 128
diff --git a/deploy/standalone/k8s/02-polaris-server-config.yaml b/deploy/standalone/k8s/02-polaris-server-config.yaml
index 0ba61194b..5a8b25e00 100644
--- a/deploy/standalone/k8s/02-polaris-server-config.yaml
+++ b/deploy/standalone/k8s/02-polaris-server-config.yaml
@@ -129,6 +129,7 @@ data:
listenIP: "0.0.0.0"
listenPort: 8090
enablePprof: true # debug pprof
+ enableSwagger: true # debug pprof
connLimit:
openConnLimit: false
maxConnPerHost: 128
diff --git a/deploy/standalone/vm/Dockerfile b/deploy/standalone/vm/Dockerfile
index 994dba7f9..85b4b8f18 100644
--- a/deploy/standalone/vm/Dockerfile
+++ b/deploy/standalone/vm/Dockerfile
@@ -1,7 +1,8 @@
FROM centos:centos7.9.2009
-ARG SERVER_VERSION=v1.10.0
-ARG CONSOLE_VERSION=v1.7.1
+ARG SERVER_VERSION=v1.12.0
+ARG CONSOLE_VERSION=v1.9.0
+ARG LIMITER_VERSION=v1.0.2
ARG GOOS=linux
ARG TARGETARCH=amd64
@@ -12,13 +13,15 @@ RUN yum install -y lsof curl unzip vixie-cron crontabs
COPY polaris-server-release_${SERVER_VERSION}.${GOOS}.${TARGETARCH}.zip /root/polaris-server-release_${SERVER_VERSION}.${GOOS}.${TARGETARCH}.zip
COPY polaris-console-release_${CONSOLE_VERSION}.${GOOS}.${TARGETARCH}.zip /root/polaris-console-release_${CONSOLE_VERSION}.${GOOS}.${TARGETARCH}.zip
+COPY polaris-limiter-release_${LIMITER_VERSION}.${GOOS}.${TARGETARCH}.zip /root/polaris-limiter-release_${LIMITER_VERSION}.${GOOS}.${TARGETARCH}.zip
COPY prometheus-2.28.0.${GOOS}-${TARGETARCH}.tar.gz /root/prometheus-2.28.0.${GOOS}-${TARGETARCH}.tar.gz
COPY install.sh /root/install.sh
+COPY prometheus-help.sh /root/prometheus-help.sh
COPY port.properties /root/port.properties
COPY run.sh /root/run.sh
WORKDIR /root
-EXPOSE 8091 8090 8761 8093 8080 9000 8761 15010 9090
+EXPOSE 8091 8090 8761 8093 8080 8100 8101 9000 8761 15010 9090
CMD ["/bin/bash", "run.sh"]