Skip to content

Commit b5d092c

Browse files
meta-dmeta-d
authored
Merge pull request #33 from meta-d/develop
v2.4.1
2 parents aead5ff + e44eb37 commit b5d092c

File tree

25 files changed

+261
-236
lines changed

25 files changed

+261
-236
lines changed

‎.deploy/api/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ocap-server",
33
"author": "Metad",
4-
"version": "2.4.0",
4+
"version": "2.4.1",
55
"scripts": {
66
"start": "nx serve",
77
"build": "nx build",

‎.deploy/k8s/ali-manifest.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ spec:
9696
spec:
9797
containers:
9898
- name: metad-prod-api
99-
image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-api:2.3.1
100-
imagePullPolicy: Always
99+
image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-api:2.4.0
100+
# imagePullPolicy: Always
101101
envFrom:
102102
- secretRef:
103103
name: ocap-secrets
@@ -233,8 +233,8 @@ spec:
233233
spec:
234234
containers:
235235
- name: metad-prod-webapp
236-
image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-webapp:2.3.1
237-
imagePullPolicy: Always
236+
image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-webapp:2.4.0
237+
# imagePullPolicy: Always
238238
ports:
239239
- containerPort: 80
240240
protocol: TCP
@@ -260,7 +260,7 @@ spec:
260260
spec:
261261
containers:
262262
- name: metad-prod-website
263-
image: registry.cn-hangzhou.aliyuncs.com/metad/website:2.3.1
263+
image: registry.cn-hangzhou.aliyuncs.com/metad/website:2.4.0
264264
ports:
265265
- containerPort: 80
266266
protocol: TCP
@@ -369,7 +369,7 @@ spec:
369369
containers:
370370
- name: postgres
371371
image: registry.cn-hangzhou.aliyuncs.com/metad/pgvector:pg12
372-
imagePullPolicy: Always
372+
# imagePullPolicy: Always
373373
ports:
374374
- containerPort: 5432
375375
env:
@@ -448,7 +448,7 @@ spec:
448448
containers:
449449
- name: redis
450450
image: registry.cn-hangzhou.aliyuncs.com/metad/redis-stack:6.2.6-v15-x86_64
451-
imagePullPolicy: Always
451+
# imagePullPolicy: Always
452452
ports:
453453
- containerPort: 6379
454454
- containerPort: 8001

‎.deploy/k8s/postgres-deployment.yaml‎

Lines changed: 159 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -1,159 +1,159 @@
1-
apiVersion: v1
2-
kind: Service
3-
metadata:
4-
name: postgres
5-
spec:
6-
type: ClusterIP
7-
selector:
8-
app: postgres
9-
ports:
10-
- protocol: TCP
11-
port: 5432
12-
---
13-
apiVersion: v1
14-
kind: Service
15-
metadata:
16-
name: db-adminer
17-
spec:
18-
type: ClusterIP
19-
selector:
20-
app: db-adminer
21-
ports:
22-
- protocol: TCP
23-
port: 8084
24-
targetPort: 8080
25-
---
26-
apiVersion: v1
27-
kind: Service
28-
metadata:
29-
name: redis
30-
spec:
31-
type: ClusterIP
32-
selector:
33-
app: redis
34-
ports:
35-
- protocol: TCP
36-
name: redis
37-
port: 6379
38-
targetPort: 6379
39-
- protocol: TCP
40-
name: insight
41-
port: 8001
42-
targetPort: 8001
43-
---
44-
apiVersion: apps/v1
45-
kind: Deployment
46-
metadata:
47-
name: postgres
48-
spec:
49-
strategy:
50-
rollingUpdate:
51-
maxSurge: 1
52-
maxUnavailable: 1
53-
type: RollingUpdate
54-
replicas: 1
55-
selector:
56-
matchLabels:
57-
app: postgres
58-
template:
59-
metadata:
60-
labels:
61-
app: postgres
62-
spec:
63-
containers:
64-
- name: postgres
65-
image: registry.cn-hangzhou.aliyuncs.com/metad/pgvector:pg12
66-
imagePullPolicy: Always
67-
ports:
68-
- containerPort: 5432
69-
env:
70-
- name: POSTGRES_USER
71-
valueFrom:
72-
secretKeyRef:
73-
name: db-secrets
74-
key: DB_USER
75-
optional: false
76-
- name: POSTGRES_PASSWORD
77-
valueFrom:
78-
secretKeyRef:
79-
name: db-secrets
80-
key: DB_PASS
81-
optional: false
82-
- name: POSTGRES_DB
83-
valueFrom:
84-
secretKeyRef:
85-
name: db-secrets
86-
key: DB_NAME
87-
optional: false
88-
- name: PGDATA
89-
value: /var/lib/postgresql/data/pgdata
90-
volumeMounts:
91-
- mountPath: /var/lib/postgresql/data
92-
name: postgredb
93-
volumes:
94-
- name: postgredb
95-
persistentVolumeClaim:
96-
claimName: db-pvc
97-
---
98-
apiVersion: apps/v1
99-
kind: Deployment
100-
metadata:
101-
name: db-adminer
102-
spec:
103-
strategy:
104-
rollingUpdate:
105-
maxSurge: 1
106-
maxUnavailable: 1
107-
type: RollingUpdate
108-
replicas: 1
109-
selector:
110-
matchLabels:
111-
app: db-adminer
112-
template:
113-
metadata:
114-
labels:
115-
app: db-adminer
116-
spec:
117-
containers:
118-
- name: adminer
119-
image: adminer:latest
120-
ports:
121-
- containerPort: 8080
122-
---
123-
apiVersion: apps/v1
124-
kind: Deployment
125-
metadata:
126-
name: redis
127-
spec:
128-
strategy:
129-
rollingUpdate:
130-
maxSurge: 1
131-
maxUnavailable: 1
132-
type: RollingUpdate
133-
replicas: 1
134-
selector:
135-
matchLabels:
136-
app: redis
137-
template:
138-
metadata:
139-
labels:
140-
app: redis
141-
spec:
142-
containers:
143-
- name: redis
144-
image: redis/redis-stack:latest
145-
imagePullPolicy: Always
146-
ports:
147-
- containerPort: 6379
148-
- containerPort: 8001
149-
env:
150-
- name: REDIS_PASSWORD
151-
valueFrom:
152-
secretKeyRef:
153-
name: db-secrets
154-
key: REDIS_PASSWORD
155-
command:
156-
- redis-server
157-
args:
158-
- --requirepass
159-
- $(REDIS_PASSWORD)
1+
# apiVersion: v1
2+
# kind: Service
3+
# metadata:
4+
# name: postgres
5+
# spec:
6+
# type: ClusterIP
7+
# selector:
8+
# app: postgres
9+
# ports:
10+
# - protocol: TCP
11+
# port: 5432
12+
# ---
13+
# apiVersion: v1
14+
# kind: Service
15+
# metadata:
16+
# name: db-adminer
17+
# spec:
18+
# type: ClusterIP
19+
# selector:
20+
# app: db-adminer
21+
# ports:
22+
# - protocol: TCP
23+
# port: 8084
24+
# targetPort: 8080
25+
# ---
26+
# apiVersion: v1
27+
# kind: Service
28+
# metadata:
29+
# name: redis
30+
# spec:
31+
# type: ClusterIP
32+
# selector:
33+
# app: redis
34+
# ports:
35+
# - protocol: TCP
36+
# name: redis
37+
# port: 6379
38+
# targetPort: 6379
39+
# - protocol: TCP
40+
# name: insight
41+
# port: 8001
42+
# targetPort: 8001
43+
# ---
44+
# apiVersion: apps/v1
45+
# kind: Deployment
46+
# metadata:
47+
# name: postgres
48+
# spec:
49+
# strategy:
50+
# rollingUpdate:
51+
# maxSurge: 1
52+
# maxUnavailable: 1
53+
# type: RollingUpdate
54+
# replicas: 1
55+
# selector:
56+
# matchLabels:
57+
# app: postgres
58+
# template:
59+
# metadata:
60+
# labels:
61+
# app: postgres
62+
# spec:
63+
# containers:
64+
# - name: postgres
65+
# image: registry.cn-hangzhou.aliyuncs.com/metad/pgvector:pg12
66+
# # imagePullPolicy: Always
67+
# ports:
68+
# - containerPort: 5432
69+
# env:
70+
# - name: POSTGRES_USER
71+
# valueFrom:
72+
# secretKeyRef:
73+
# name: ocap-secrets
74+
# key: DB_USER
75+
# optional: false
76+
# - name: POSTGRES_PASSWORD
77+
# valueFrom:
78+
# secretKeyRef:
79+
# name: ocap-secrets
80+
# key: DB_PASS
81+
# optional: false
82+
# - name: POSTGRES_DB
83+
# valueFrom:
84+
# secretKeyRef:
85+
# name: ocap-secrets
86+
# key: DB_NAME
87+
# optional: false
88+
# - name: PGDATA
89+
# value: /var/lib/postgresql/data/pgdata
90+
# volumeMounts:
91+
# - mountPath: /var/lib/postgresql/data
92+
# name: postgredb
93+
# volumes:
94+
# - name: postgredb
95+
# persistentVolumeClaim:
96+
# claimName: db-pvc
97+
# ---
98+
# apiVersion: apps/v1
99+
# kind: Deployment
100+
# metadata:
101+
# name: db-adminer
102+
# spec:
103+
# strategy:
104+
# rollingUpdate:
105+
# maxSurge: 1
106+
# maxUnavailable: 1
107+
# type: RollingUpdate
108+
# replicas: 1
109+
# selector:
110+
# matchLabels:
111+
# app: db-adminer
112+
# template:
113+
# metadata:
114+
# labels:
115+
# app: db-adminer
116+
# spec:
117+
# containers:
118+
# - name: adminer
119+
# image: adminer:latest
120+
# ports:
121+
# - containerPort: 8080
122+
# ---
123+
# apiVersion: apps/v1
124+
# kind: Deployment
125+
# metadata:
126+
# name: redis
127+
# spec:
128+
# strategy:
129+
# rollingUpdate:
130+
# maxSurge: 1
131+
# maxUnavailable: 1
132+
# type: RollingUpdate
133+
# replicas: 1
134+
# selector:
135+
# matchLabels:
136+
# app: redis
137+
# template:
138+
# metadata:
139+
# labels:
140+
# app: redis
141+
# spec:
142+
# containers:
143+
# - name: redis
144+
# image: redis/redis-stack:latest
145+
# # imagePullPolicy: Always
146+
# ports:
147+
# - containerPort: 6379
148+
# - containerPort: 8001
149+
# env:
150+
# - name: REDIS_PASSWORD
151+
# valueFrom:
152+
# secretKeyRef:
153+
# name: ocap-secrets
154+
# key: REDIS_PASSWORD
155+
# command:
156+
# - redis-server
157+
# args:
158+
# - --requirepass
159+
# - $(REDIS_PASSWORD)

0 commit comments

Comments
 (0)