Skip to content

Commit 579f57a

Browse files
gaoxueyugaoxueyu
authored
Merge pull request #11 from czhangzhang/IVYC_REL_5_STABLE
Ivyc rel 5 stable
2 parents 75d4cb2 + 2400433 commit 579f57a

6 files changed

Lines changed: 51 additions & 48 deletions

File tree

‎README.md‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
# Installation
22

3-
## Installation instructions
3+
## Prerequisites
4+
5+
- JDK 1.8
6+
- [Maven](http://maven.apache.org/) 3.0 and above
7+
- IvorySQL 5.0
8+
- Kubernetes 1.23 (Must have default storage class)
49

5-
As an open-source backend project, ivory-cloud requires the local installation of `git`, `jdk`, `maven`, etc., during the development process.
10+
## Installation instructions
611

712
Fork the backend repository of the open-source cloud platform to your own GitHub account, then clone it to your local machine, for example:
813

@@ -21,30 +26,46 @@ cd ivory-cloud
2126
## Deployment
2227

2328
### Compile and build
29+
1. Please ensure that all files ending with .sh in the ivory-cloud\cloudnative\src\main\resources\monitor folder and all its subfolders are in UNIX format. If they are not, please run the dos2unix command to convert them to UNIX format.
2430

25-
Maven：Maven configuration is required，After configuration, execute the following command：
31+
2. Maven：Maven configuration is required，After configuration, execute the following command：
2632

2733
```
2834
mvn clean
29-
mvn install
35+
mvn package -D maven.test.skip=true
3036
```
31-
After the packaging is completed, you can find the `pkg` directory in the root directory of the project. It contains the jar package to be deployed.
37+
After the packaging is completed, you can find the cloudnative-1.0-SNAPSHOT.jar file at the path ivory-cloud/cloudnative/target.
3238
### Deploy backend projects
33-
Install a database such as ivorysql on your server and start it.
34-
Place the above jar package in your server, then edit [configuration file](./cloudnative/src/main/resources/application-native.yaml)
35-
Among them, 5432 is the port on which the ivorysql database runs; please modify it according to the actual situation.
39+
1. Install a database such as ivorysql on your server and start it.
40+
2. create a directory to store the application files. For example:
41+
```
42+
mkdir -p /home/ivory
43+
```
44+
4. upload JAR file (cloudnative-1.0-SNAPSHOT.jar) to your server.
45+
5. create a directory(name must be: config) under /home/ivory to store the application files. For example:
46+
```
47+
mkdir -p /home/ivory/config
48+
```
49+
6. Please upload below files from the source code path ivory-cloud/cloudnative/src/main/resources to the /home/ivory/config path on your server.
50+
```
51+
application.yaml
52+
application-native.yaml
53+
spring_pro_logback.xml
54+
```
55+
8. then edit /home/ivory/config/application-native.yaml
56+
Please modify url, username, password parts according to your actual situation.
3657
```
3758
datasource:
3859
druid:
3960
db-type: com.alibaba.druid.pool.DruidDataSource
4061
driver-class-name: org.postgresql.Driver
41-
url: jdbc:postgresql://127.0.0.1:5432/ivory
62+
url: jdbc:postgresql://127.0.0.1:5432/ivorysql
4263
username: ivorysql
4364
password: "ivory@123"
4465
```
45-
In the directory where the jar package is located, execute:
66+
7. Launch ivory-cloud app
67+
cd /home/ivory/
4668

4769
```
48-
nohup java -jar cloudservice-1.0-SNAPSHOT.jar > log_native 2>&1 &
70+
nohup java -jar cloudnative-1.0-SNAPSHOT.jar > log_native 2>&1 &
4971
```
50-
cloudservice-1.0-SNAPSHOT.jar is the name of the jar package; please replace it according to the actual situation.

‎cloudnative/src/main/java/com/highgo/platform/apiserver/service/impl/AlertAutoScalingServiceImpl.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import com.highgo.platform.exception.AutoScalingException;
5858
import com.highgo.platform.utils.AsyncTask;
5959
import lombok.extern.slf4j.Slf4j;
60+
import org.springframework.context.annotation.Lazy;
6061
import org.springframework.beans.factory.annotation.Autowired;
6162
import org.springframework.beans.factory.annotation.Value;
6263
import org.springframework.data.domain.PageRequest;
@@ -99,6 +100,7 @@ public class AlertAutoScalingServiceImpl implements AlertAutoScalingService {
99100
private K8sClusterService k8sClusterService;
100101

101102
@Resource(name = "asyncTask")
103+
@Lazy
102104
private AsyncTask asyncTask;
103105

104106
@Value("${common.serviceName}")

‎cloudnative/src/main/java/com/highgo/platform/apiserver/service/impl/MonitorServiceImpl.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.highgo.platform.errorcode.ClusterError;
3434
import com.highgo.platform.exception.ClusterException;
3535
import com.highgo.platform.utils.AsyncTask;
36+
import org.springframework.context.annotation.Lazy;
3637
import org.slf4j.Logger;
3738
import org.slf4j.LoggerFactory;
3839
import org.springframework.beans.factory.annotation.Autowired;
@@ -63,6 +64,7 @@ public class MonitorServiceImpl implements MonitorService {
6364
private K8sClusterInfoRepository k8sClusterInfoRepository;
6465

6566
@Resource(name = "asyncTask")
67+
@Lazy
6668
private AsyncTask asyncTask;
6769

6870
@Value("${common.serviceName}")

‎cloudnative/src/main/resources/application-native.yaml‎

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ spring:
99
druid:
1010
db-type: com.alibaba.druid.pool.DruidDataSource
1111
driver-class-name: org.postgresql.Driver
12-
url: jdbc:postgresql://127.0.0.1:5432/ivory
13-
username: postgres
14-
password: "highgo@123"
12+
url: jdbc:postgresql://127.0.0.1:5432/ivorysql
13+
username: ivorysql
14+
password: "ivory@123"
1515
jpa:
1616
show-sql: false
1717
open-in-view: false
@@ -32,39 +32,25 @@ common:
3232
alert-path-prefix: alert
3333
serviceName: ivory
3434
namespace: ivory
35-
# storageClassLabels: "{'cnp.inspurcloud.cn/system-storageclass': 'false'}"
3635
refreshWatcherTaskTime: 600000 # 单位ms 默认10分钟
3736
linuxk8sConfigPath: /root/.kube/config
3837
# ivoryPgKernelVersion: 15 #数据库内核版本
3938
# ivoryVersion: 2.3 #ivory版本
40-
ivoryPgKernelVersion: 17 #数据库内核版本
41-
ivoryVersion: 4.5 #ivory版本
39+
ivoryPgKernelVersion: 18 #数据库内核版本
40+
ivoryVersion: 5.0 #ivory版本
4241
logging:
4342
level:
44-
# com:
45-
# inspur:
46-
# common: ERROR
4743
org:
4844
hibernate: error
4945
root: info
5046
config: config/spring_pro_logback.xml
5147

5248
images:
53-
# image:
54-
# db: harbor.highgo.com/highgo/crunchy-highgo:sm3nodemx
55-
# backrest: harbor.highgo.com/highgo/crunchy-pgbackrest:sm3-v2
56-
# pgadmin: harbor.highgo.com/highgo/crunchy-pgadmin4:hgadmin2
57-
# exporter: harbor.highgo.com/highgo/crunchy-postgres-exporter:v1.5
58-
# image:
59-
# db: docker.io/ivorysql/ivorysql:ubi8-2.2-1.1-1
60-
# backrest: docker.io/ivorysql/pgbackrest:ubi8-2.45-1.1-1
61-
# pgadmin: docker.io/ivorysql/pgadmin:ubi8-7.4-1.1-1
62-
# exporter: docker.io/ivorysql/postgres-exporter:ubi8-0.13.2-1.1-1
6349
image:
64-
db: docker.io/ivorysql/ivorysql:ubi8-4.5-4.0-1
65-
backrest: docker.io/ivorysql/pgbackrest:ubi8-2.54.1-4.0-1
66-
pgadmin: docker.io/ivorysql/pgadmin:ubi8-8.14.0-4.0-1
67-
exporter: docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-4.0-1
50+
db: docker.io/ivorysql/ivorysql:ubi8-5.0-5.0-1
51+
backrest: docker.io/ivorysql/pgbackrest:ubi8-2.56.0-5.0-1
52+
pgadmin: docker.io/ivorysql/pgadmin:ubi8-9.9-5.0-1
53+
exporter: docker.io/ivorysql/postgres-exporter:ubi8-0.17.0-5.0-1
6854
server:
6955
port: 8081
7056
error:
@@ -73,31 +59,19 @@ server:
7359

7460
cluster:
7561
user: pguser
76-
# user: hguser
7762
group: ivory-operator.ivorysql.org
78-
# group: highgo-operator.inspur.com
7963
version: v1beta1
80-
# version: v1beta1
8164
kind: IvoryCluster
82-
# kind: PostgresCluster
8365
plural: ivoryclusters
84-
# plural: highgoclusters
8566
singular: ivorycluster
86-
# singular: highgocluster
8767
instanceIdName: ivory/instanceId
88-
# instanceIdName: highgo/instanceId
8968
clusterId: ivory/clusterId
90-
# clusterId: highgo/clusterId
91-
# prometheusFilter: highgo/user
9269
prometheusFilter: ivory/user
9370
clusterNameLabel: ${cluster.group}/cluster
9471
clusterRoleLabel: ${cluster.group}/role
9572
clusterDataLabel: ${cluster.group}/data
9673
crBackupAnnotation: ${cluster.group}/pgbackrest-backup
9774
crRestoreAnnotation: ${cluster.group}/pgbackrest-restore
9875
grafanaName: grafana
99-
# grafanaName: crunchy-grafana
10076
alertManagerName: alertmanager
101-
# alertManagerName: crunchy-alertmanager
10277
prometheusName: prometheus
103-
# prometheusName: crunchy-prometheus

‎cloudnative/src/main/resources/db/changelog/ivory/0000-init.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<column name="max" type="VARCHAR(36)"/>
115115
<column name="enum_value" type="VARCHAR(512)"/>
116116
<column name="rule" type="VARCHAR(64)"/>
117-
<column name="description" type="VARCHAR(255)"/>
117+
<column name="description" type="VARCHAR(512)"/>
118118
<column name="created_at" type="datetime"/>
119119
<column name="updated_at" type="datetime"/>
120120
<column name="deleted_at" type="datetime"/>

‎ivory-cloud_release_notes.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
ivory-cloud RELEASE NOTES
2+
******************v5.0******************
3+
1.IvorySqL 5.0适配
4+
5+
26

37
******************v4.0******************
48
1.IvorySqL operator 4.0适配（包括postgres-exporter、pgbackrest以及pgadmin的适配）

0 commit comments

Comments
 (0)