Merge pull request #33 from meta-d/develop

v2.4.1
meta-d · Jul 4, 2024 · b5d092c · b5d092c
2 parents aead5ff + e44eb37
commit b5d092c
Show file tree

Hide file tree

Showing 25 changed files with 261 additions and 236 deletions.
diff --git a/.deploy/api/package.json b/.deploy/api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ocap-server",
   "author": "Metad",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "scripts": {
     "start": "nx serve",
     "build": "nx build",

diff --git a/.deploy/k8s/ali-manifest.yaml b/.deploy/k8s/ali-manifest.yaml
@@ -96,8 +96,8 @@ spec:
     spec:
       containers:
         - name: metad-prod-api
-          image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-api:2.3.1
-          imagePullPolicy: Always
+          image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-api:2.4.0
+          # imagePullPolicy: Always
           envFrom:
             - secretRef:
                 name: ocap-secrets
@@ -233,8 +233,8 @@ spec:
     spec:
       containers:
         - name: metad-prod-webapp
-          image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-webapp:2.3.1
-          imagePullPolicy: Always
+          image: registry.cn-hangzhou.aliyuncs.com/metad/ocap-webapp:2.4.0
+          # imagePullPolicy: Always
           ports:
             - containerPort: 80
               protocol: TCP
@@ -260,7 +260,7 @@ spec:
     spec:
       containers:
         - name: metad-prod-website
-          image: registry.cn-hangzhou.aliyuncs.com/metad/website:2.3.1
+          image: registry.cn-hangzhou.aliyuncs.com/metad/website:2.4.0
           ports:
             - containerPort: 80
               protocol: TCP
@@ -369,7 +369,7 @@ spec:
       containers:
         - name: postgres
           image: registry.cn-hangzhou.aliyuncs.com/metad/pgvector:pg12
-          imagePullPolicy: Always
+          # imagePullPolicy: Always
           ports:
             - containerPort: 5432
           env:
@@ -448,7 +448,7 @@ spec:
       containers:
         - name: redis
           image: registry.cn-hangzhou.aliyuncs.com/metad/redis-stack:6.2.6-v15-x86_64
-          imagePullPolicy: Always
+          # imagePullPolicy: Always
           ports:
             - containerPort: 6379
             - containerPort: 8001

diff --git a/.deploy/k8s/postgres-deployment.yaml b/.deploy/k8s/postgres-deployment.yaml
@@ -1,159 +1,159 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: postgres
-spec:
-  type: ClusterIP
-  selector:
-    app: postgres
-  ports:
-    - protocol: TCP
-      port: 5432
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: db-adminer
-spec:
-  type: ClusterIP
-  selector:
-    app: db-adminer
-  ports:
-    - protocol: TCP
-      port: 8084
-      targetPort: 8080
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-spec:
-  type: ClusterIP
-  selector:
-    app: redis
-  ports:
-    - protocol: TCP
-      name: redis
-      port: 6379
-      targetPort: 6379
-    - protocol: TCP
-      name: insight
-      port: 8001
-      targetPort: 8001
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: postgres
-spec:
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  replicas: 1
-  selector:
-    matchLabels:
-      app: postgres
-  template:
-    metadata:
-      labels:
-        app: postgres
-    spec:
-      containers:
-        - name: postgres
-          image: registry.cn-hangzhou.aliyuncs.com/metad/pgvector:pg12
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 5432
-          env:
-            - name: POSTGRES_USER
-              valueFrom:
-                secretKeyRef:
-                  name: db-secrets
-                  key: DB_USER
-                  optional: false
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: db-secrets
-                  key: DB_PASS
-                  optional: false
-            - name: POSTGRES_DB
-              valueFrom:
-                secretKeyRef:
-                  name: db-secrets
-                  key: DB_NAME
-                  optional: false
-            - name: PGDATA
-              value: /var/lib/postgresql/data/pgdata
-          volumeMounts:
-            - mountPath: /var/lib/postgresql/data
-              name: postgredb
-      volumes:
-        - name: postgredb
-          persistentVolumeClaim:
-            claimName: db-pvc
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: db-adminer
-spec:
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  replicas: 1
-  selector:
-    matchLabels:
-      app: db-adminer
-  template:
-    metadata:
-      labels:
-        app: db-adminer
-    spec:
-      containers:
-        - name: adminer
-          image: adminer:latest
-          ports:
-            - containerPort: 8080
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: redis
-spec:
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-    type: RollingUpdate
-  replicas: 1
-  selector:
-    matchLabels:
-      app: redis
-  template:
-    metadata:
-      labels:
-        app: redis
-    spec:
-      containers:
-        - name: redis
-          image: redis/redis-stack:latest
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 6379
-            - containerPort: 8001
-          env:
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: db-secrets
-                  key: REDIS_PASSWORD
-          command:
-            - redis-server
-          args:
-            - --requirepass
-            - $(REDIS_PASSWORD)
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: postgres
+# spec:
+#   type: ClusterIP
+#   selector:
+#     app: postgres
+#   ports:
+#     - protocol: TCP
+#       port: 5432
+# ---
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: db-adminer
+# spec:
+#   type: ClusterIP
+#   selector:
+#     app: db-adminer
+#   ports:
+#     - protocol: TCP
+#       port: 8084
+#       targetPort: 8080
+# ---
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: redis
+# spec:
+#   type: ClusterIP
+#   selector:
+#     app: redis
+#   ports:
+#     - protocol: TCP
+#       name: redis
+#       port: 6379
+#       targetPort: 6379
+#     - protocol: TCP
+#       name: insight
+#       port: 8001
+#       targetPort: 8001
+# ---
+# apiVersion: apps/v1
+# kind: Deployment
+# metadata:
+#   name: postgres
+# spec:
+#   strategy:
+#     rollingUpdate:
+#       maxSurge: 1
+#       maxUnavailable: 1
+#     type: RollingUpdate
+#   replicas: 1
+#   selector:
+#     matchLabels:
+#       app: postgres
+#   template:
+#     metadata:
+#       labels:
+#         app: postgres
+#     spec:
+#       containers:
+#         - name: postgres
+#           image: registry.cn-hangzhou.aliyuncs.com/metad/pgvector:pg12
+#           # imagePullPolicy: Always
+#           ports:
+#             - containerPort: 5432
+#           env:
+#             - name: POSTGRES_USER
+#               valueFrom:
+#                 secretKeyRef:
+#                   name: ocap-secrets
+#                   key: DB_USER
+#                   optional: false
+#             - name: POSTGRES_PASSWORD
+#               valueFrom:
+#                 secretKeyRef:
+#                   name: ocap-secrets
+#                   key: DB_PASS
+#                   optional: false
+#             - name: POSTGRES_DB
+#               valueFrom:
+#                 secretKeyRef:
+#                   name: ocap-secrets
+#                   key: DB_NAME
+#                   optional: false
+#             - name: PGDATA
+#               value: /var/lib/postgresql/data/pgdata
+#           volumeMounts:
+#             - mountPath: /var/lib/postgresql/data
+#               name: postgredb
+#       volumes:
+#         - name: postgredb
+#           persistentVolumeClaim:
+#             claimName: db-pvc
+# ---
+# apiVersion: apps/v1
+# kind: Deployment
+# metadata:
+#   name: db-adminer
+# spec:
+#   strategy:
+#     rollingUpdate:
+#       maxSurge: 1
+#       maxUnavailable: 1
+#     type: RollingUpdate
+#   replicas: 1
+#   selector:
+#     matchLabels:
+#       app: db-adminer
+#   template:
+#     metadata:
+#       labels:
+#         app: db-adminer
+#     spec:
+#       containers:
+#         - name: adminer
+#           image: adminer:latest
+#           ports:
+#             - containerPort: 8080
+# ---
+# apiVersion: apps/v1
+# kind: Deployment
+# metadata:
+#   name: redis
+# spec:
+#   strategy:
+#     rollingUpdate:
+#       maxSurge: 1
+#       maxUnavailable: 1
+#     type: RollingUpdate
+#   replicas: 1
+#   selector:
+#     matchLabels:
+#       app: redis
+#   template:
+#     metadata:
+#       labels:
+#         app: redis
+#     spec:
+#       containers:
+#         - name: redis
+#           image: redis/redis-stack:latest
+#           # imagePullPolicy: Always
+#           ports:
+#             - containerPort: 6379
+#             - containerPort: 8001
+#           env:
+#             - name: REDIS_PASSWORD
+#               valueFrom:
+#                 secretKeyRef:
+#                   name: ocap-secrets
+#                   key: REDIS_PASSWORD
+#           command:
+#             - redis-server
+#           args:
+#             - --requirepass
+#             - $(REDIS_PASSWORD)