Skip to content

Commit e27c0d8

Browse files
chuntaojunchuntaojun
authored
Fix/gitub action deploy (polarismesh#873)
1 parent 2689942 commit e27c0d8

18 files changed

+195
-56
lines changed

‎.github/workflows/docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ jobs:
6969
GOARCH: ${{ matrix.goarch }}
7070
DOCKER_TAG: ${{ steps.get_version.outputs.VERSION }}
7171
run: |
72-
cd deploy/docker/prometheus
72+
cd release/standalone/docker/prometheus
7373
ls -lstrh
7474
bash build_docker_prom.sh ${DOCKER_TAG}

‎Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,7 @@ build: ## Build binary and tarball.
5454
.PHONY: build-docker
5555
build-docker: ## Build polaris-server docker images.
5656
bash ./release/build_docker.sh $(IMAGE_TAG)
57+
58+
.PHONY: clean
59+
clean: ## Clean polaris-server make data.
60+
@rm -rf polaris-server-release_*

‎release/build_docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ if [ ${pre_release} == 0 ]; then
5050
extra_tags="-t ${docker_repository}/polaris-server:latest"
5151
fi
5252

53-
docker buildx build --network=host -t ${docker_repository}/polaris-server:${docker_tag} ${extra_tags} --platform ${platforms} --push ./
53+
docker buildx build -f ./release/Dockerfile --network=host -t ${docker_repository}/polaris-server:${docker_tag} ${extra_tags} --platform ${platforms} --push ./

‎release/cluster/helm/templates/config-polaris-console.yaml

+34-6
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,47 @@ data:
1515
mode: "release"
1616
listenIP: "0.0.0.0"
1717
listenPort: {{ .Values.service.webPort }}
18+
jwt:
19+
secretKey: "polarismesh@2021"
20+
expired: 1800
1821
namingV1URL: "/naming/v1"
1922
namingV2URL: "/naming/v2"
2023
authURL: "/core/v1"
21-
requestURL: "/naming/v1"
2224
configURL: "/config/v1"
2325
monitorURL: "/api/v1"
2426
webPath: "web/dist/"
2527
polarisServer:
2628
address: "127.0.0.1:{{ .Values.service.httpPort }}"
27-
polarisToken: "polaris@12345678"
29+
polarisToken: "nu/0WRA4EqSR1FagrjRj0fZwPXuGlMpX+zCuWu4uMqy8xr1vRjisSbA25aAC3mtU8MeeRsKhQiDAynUR09I="
2830
monitorServer:
2931
address: "polaris-prometheus:9090"
30-
oaAuthority:
31-
enableOAAuth: false
32-
hrData:
33-
enableHrData: false
32+
# eventServer:
33+
# requestUrl:
34+
# timeout: 5s
35+
# operationServer:
36+
# requestUrl:
37+
# timeout: 5s
38+
# 存储配置
39+
store:
40+
{{- if eq .Values.global.mode "cluster" }}
41+
# 数据库存储插件
42+
{{- with .Values.polaris.storage.db.console }}
43+
name: defaultStore
44+
option:
45+
master:
46+
dbType: mysql
47+
dbUser: {{ .user }}
48+
dbPwd: {{ .password }}
49+
dbAddr: {{ .address }}
50+
dbName: {{ .name }}
51+
maxOpenConns: -1
52+
maxIdleConns: -1
53+
connMaxLifetime: 300 # 单位秒
54+
txIsolationLevel: 2 #LevelReadCommitted
55+
{{- end }}
56+
{{- else }}
57+
# 单机文件存储插件
58+
name: boltdbStore
59+
option:
60+
path: ./polaris.bolt
61+
{{- end }}

‎release/cluster/helm/templates/config-polaris-server.yaml

+2-10
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ data:
121121
- stderr
122122
discoverEventLocal:
123123
rotateOutputPath: log/event/polaris-discoverevent.log
124-
errorRotateOutputPath: log/polaris-discoverevent-error.log
124+
errorRotateOutputPath: log/event/polaris-discoverevent-error.log
125125
rotationMaxSize: 100
126126
rotationMaxBackups: 10
127127
rotationMaxAge: 7
@@ -253,14 +253,6 @@ data:
253253
openConnLimit: false
254254
maxConnPerHost: 128
255255
maxConnLimit: 10240
256-
- name: prometheus-sd
257-
option:
258-
listenIP: "0.0.0.0"
259-
listenPort: {{ .Values.service.prometheusPort }}
260-
connLimit:
261-
openConnLimit: false
262-
maxConnPerHost: 128
263-
maxConnLimit: 10240
264256
# - name: service-l5
265257
# option:
266258
# listenIP: 0.0.0.0
@@ -371,7 +363,7 @@ data:
371363
store:
372364
{{- if eq .Values.global.mode "cluster" }}
373365
# 数据库存储插件
374-
{{- with .Values.polaris.storage.db }}
366+
{{- with .Values.polaris.storage.db.server }}
375367
name: defaultStore
376368
option:
377369
master:

‎release/cluster/helm/templates/config-prometheus.yaml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: polaris-prometheus-config
5+
namespace: {{ .Values.installation.namespace }}
6+
data:
7+
prometheus.yaml: |-
8+
# my global config
9+
global:
10+
scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
11+
evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
12+
# scrape_timeout is set to the global default (10s).
13+
14+
# Alertmanager configuration
15+
alerting:
16+
alertmanagers:
17+
- static_configs:
18+
- targets:
19+
- 127.0.0.1:9093
20+
21+
# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
22+
rule_files:
23+
# - "first_rules.yml"
24+
# - "second_rules.yml"
25+
- "/data/prom_rules/prom-alarm-rules.yml"
26+
27+
# A scrape configuration containing exactly one endpoint to scrape:
28+
# Here it's Prometheus itself.
29+
scrape_configs:
30+
# The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
31+
- job_name: "prometheus"
32+
# metrics_path defaults to '/metrics'
33+
# scheme defaults to 'http'.
34+
static_configs:
35+
- targets: ["localhost:9090"]
36+
http_sd_configs:
37+
- url: http://polaris:8090/prometheus/v1/clients
38+
honor_labels: true
39+
- job_name: "push-metrics"
40+
static_configs:
41+
- targets: ["localhost:9091"]

‎release/cluster/helm/templates/polaris-server.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ spec:
2727
- port: {{ .Values.service.eurekaPort }}
2828
name: service-eureka
2929
targetPort: {{ .Values.service.eurekaPort }}
30-
- port: {{ .Values.service.prometheusPort }}
31-
name: prometheus-sd
32-
targetPort: {{ .Values.service.prometheusPort }}
3330
selector:
3431
app: polaris
3532
---

‎release/cluster/helm/templates/prometheus.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,17 @@ spec:
4646
- image: {{ .Values.prometheus.image.repository }}:{{ .Values.prometheus.image.tag }}
4747
imagePullPolicy: {{ .Values.prometheus.image.pullPolicy }}
4848
name: polaris-prometheus
49+
args:
50+
- '--config.file=/etc/prometheus/prometheus.yaml'
51+
- '--web.enable-lifecycle'
4952
resources:
5053
limits:
5154
cpu: "500m"
5255
memory: 1000Mi
56+
volumeMounts:
57+
- mountPath: /etc/prometheus/prometheus.yaml
58+
name: polaris-prometheus-config
59+
subPath: prometheus.yaml
5360
- image: {{ .Values.prometheus.pushgateway.image.repository }}:{{ .Values.prometheus.pushgateway.image.tag }}
5461
imagePullPolicy: {{ .Values.prometheus.pushgateway.image.pullPolicy }}
5562
name: polaris-pushgateway
@@ -58,3 +65,8 @@ spec:
5865
cpu: "500m"
5966
memory: 1000Mi
6067
restartPolicy: Always
68+
volumes:
69+
- configMap:
70+
defaultMode: 420
71+
name: polaris-prometheus-config
72+
name: polaris-prometheus-config

‎release/cluster/helm/values.yaml

+10-5
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,16 @@ polaris:
3737
clientOpen: false
3838
storage:
3939
db:
40-
address: localhost:3306
41-
name: polaris_server
42-
user: root
43-
password: polaris@123456
40+
server:
41+
address: localhost:3306
42+
name: polaris_server
43+
user: root
44+
password: polaris@123456
45+
console:
46+
address: localhost:3306
47+
name: polaris_console
48+
user: root
49+
password: polaris@123456
4450
redis:
4551
address: localhost:6379
4652
# ACL user from redis v6.0, remove it if ACL is not available
@@ -67,7 +73,6 @@ service:
6773
serviceGrpcPort: 8091
6874
xdsv3Port: 15010
6975
configGrpcPort: 8093
70-
prometheusPort: 9000
7176
limiterHttpPort: 8100
7277
limiterGrpcPort: 8101
7378

‎release/cluster/kubernetes/01-polaris-console-config.yaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ data:
1111
mode: "release"
1212
listenIP: "0.0.0.0"
1313
listenPort: 8080
14+
jwt:
15+
secretKey: "polarismesh@2021"
16+
expired: 1800
1417
namingV1URL: "/naming/v1"
1518
namingV2URL: "/naming/v2"
1619
authURL: "/core/v1"
@@ -23,10 +26,11 @@ data:
2326
polarisToken: "polaris@12345678"
2427
monitorServer:
2528
address: "polaris-prometheus:9090"
26-
oaAuthority:
27-
enableOAAuth: false
28-
hrData:
29-
enableHrData: false
29+
store:
30+
# 单机文件存储插件
31+
name: boltdbStore
32+
option:
33+
path: ./polaris.bolt
3034
kind: ConfigMap
3135
metadata:
3236
name: polaris-console-config

‎release/cluster/kubernetes/02-polaris-server-config.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,6 @@ data:
247247
openConnLimit: false
248248
maxConnPerHost: 128
249249
maxConnLimit: 10240
250-
- name: prometheus-sd
251-
option:
252-
listenIP: "0.0.0.0"
253-
listenPort: 9000
254-
connLimit:
255-
openConnLimit: false
256-
maxConnPerHost: 128
257-
maxConnLimit: 10240
258250
# - name: service-l5
259251
# option:
260252
# listenIP: 0.0.0.0

‎release/cluster/kubernetes/04-prometheus-config.yaml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: polaris-prometheus-config
5+
namespace: polaris-system
6+
data:
7+
prometheus.yaml: |-
8+
# my global config
9+
global:
10+
scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
11+
evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
12+
# scrape_timeout is set to the global default (10s).
13+
14+
# Alertmanager configuration
15+
alerting:
16+
alertmanagers:
17+
- static_configs:
18+
- targets:
19+
- 127.0.0.1:9093
20+
21+
# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
22+
rule_files:
23+
# - "first_rules.yml"
24+
# - "second_rules.yml"
25+
- "/data/prom_rules/prom-alarm-rules.yml"
26+
27+
# A scrape configuration containing exactly one endpoint to scrape:
28+
# Here it's Prometheus itself.
29+
scrape_configs:
30+
# The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
31+
- job_name: "prometheus"
32+
# metrics_path defaults to '/metrics'
33+
# scheme defaults to 'http'.
34+
static_configs:
35+
- targets: ["localhost:9090"]
36+
http_sd_configs:
37+
- url: http://polaris:8090/prometheus/v1/clients
38+
honor_labels: true
39+
- job_name: "push-metrics"
40+
static_configs:
41+
- targets: ["localhost:9091"]

‎release/cluster/kubernetes/04-prometheus.yaml ‎release/cluster/kubernetes/05-prometheus.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,17 @@ spec:
4646
- image: polarismesh/polaris-prometheus:##POLARIS_PROMETHEUS_VERSION##
4747
imagePullPolicy: Always
4848
name: polaris-prometheus
49+
args:
50+
- '--config.file=/etc/prometheus/prometheus.yaml'
51+
- '--web.enable-lifecycle'
4952
resources:
5053
limits:
5154
cpu: "500m"
5255
memory: 1000Mi
56+
volumeMounts:
57+
- mountPath: /etc/prometheus/prometheus.yaml
58+
name: polaris-prometheus-config
59+
subPath: prometheus.yaml
5360
- image: prom/pushgateway:latest
5461
imagePullPolicy: Always
5562
name: polaris-pushgateway
@@ -58,3 +65,8 @@ spec:
5865
cpu: "500m"
5966
memory: 1000Mi
6067
restartPolicy: Always
68+
volumes:
69+
- configMap:
70+
defaultMode: 420
71+
name: polaris-prometheus-config
72+
name: polaris-prometheus-config

‎release/cluster/kubernetes/05-polaris-limiter-config.yaml ‎release/cluster/kubernetes/06-polaris-limiter-config.yaml

File renamed without changes.

‎release/cluster/kubernetes/06-polaris-limiter.yaml ‎release/cluster/kubernetes/07-polaris-limiter.yaml

File renamed without changes.

‎release/standalone/docker-compose/console/polaris-console.yaml

+27-8
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,38 @@ webServer:
2323
mode: "release"
2424
listenIP: "0.0.0.0"
2525
listenPort: 8080
26+
jwt:
27+
secretKey: "polarismesh@2021"
28+
expired: 1800
2629
namingV1URL: "/naming/v1"
2730
namingV2URL: "/naming/v2"
2831
authURL: "/core/v1"
29-
requestURL: "/naming/v1"
3032
configURL: "/config/v1"
3133
monitorURL: "/api/v1"
3234
webPath: "web/dist/"
3335
polarisServer:
34-
address: "polaris-server:8090"
35-
polarisToken: "polaris@12345678"
36+
address: "127.0.0.1:8090"
37+
polarisToken: "nu/0WRA4EqSR1FagrjRj0fZwPXuGlMpX+zCuWu4uMqy8xr1vRjisSbA25aAC3mtU8MeeRsKhQiDAynUR09I="
3638
monitorServer:
37-
address: "polaris-prometheus:9090"
38-
oaAuthority:
39-
enableOAAuth: false
40-
hrData:
41-
enableHrData: false
39+
address: "127.0.0.1:9090"
40+
# eventServer:
41+
# requestUrl:
42+
# timeout: 5s
43+
# operationServer:
44+
# requestUrl:
45+
# timeout: 5s
46+
# 存储配置
47+
store:
48+
# 数据库存储插件
49+
name: defaultStore
50+
option:
51+
master:
52+
dbType: mysql
53+
dbName: polaris_console
54+
dbUser: root
55+
dbPwd: polaris
56+
dbAddr: mysql:3306
57+
maxOpenConns: 300
58+
maxIdleConns: 50
59+
connMaxLifetime: 300 # 单位秒
60+
txIsolationLevel: 2 #LevelReadCommitted

‎release/standalone/docker-compose/prometheus/prometheus.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ scrape_configs:
1616
static_configs:
1717
- targets: [ "polaris-pushgateway:9091" ]
1818
- job_name: "polaris-server"
19-
static_configs:
20-
- targets: [ "polaris-server:9090" ]
19+
http_sd_configs:
20+
- url: "polaris-server:8090/prometheus/v1/clients"

0 commit comments

Comments
 (0)