Compare commits

...

1 Commits

Author SHA1 Message Date
eball
8f561d980a analytics: fix typo 2025-05-30 21:36:38 +08:00
3 changed files with 28 additions and 28 deletions

View File

@@ -2027,7 +2027,7 @@ data:
}
upstream Analytics {
server anayltic2-server.os-system:3010;
server analytics-server.os-system:3010;
}
upstream HamiServer {
@@ -2637,7 +2637,7 @@ data:
}
upstream AnalyticsStudio {
server anayltic2-server.os-system:3010;
server analytics-server.os-system:3010;
}
server {

View File

@@ -1,12 +1,12 @@
{{ $anayltic2_rootpath := printf "%s%s" .Values.rootPath "/rootfs/anayltic2" }}
{{ $analytics_rootpath := printf "%s%s" .Values.rootPath "/rootfs/analytics" }}
{{- $namespace := printf "%s" "os-system" -}}
{{- $anayltic2_secret := (lookup "v1" "Secret" $namespace "anayltic2-secrets") -}}
{{- $analytics_secret := (lookup "v1" "Secret" $namespace "analytics-secrets") -}}
{{- $pg_password := "" -}}
{{ if $anayltic2_secret -}}
{{ $pg_password = (index $anayltic2_secret "data" "pg_password") }}
{{ if $analytics_secret -}}
{{ $pg_password = (index $analytics_secret "data" "pg_password") }}
{{ else -}}
{{ $pg_password = randAlphaNum 16 | b64enc }}
{{- end -}}
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Secret
metadata:
name: anayltic2-secrets
name: analytics-secrets
namespace: os-system
type: Opaque
data:
@@ -25,30 +25,30 @@ data:
apiVersion: apr.bytetrade.io/v1alpha1
kind: MiddlewareRequest
metadata:
name: anayltic2-pg
name: analytics-pg
namespace: os-system
spec:
app: anayltic2
app: analytics
appNamespace: os-system
middleware: postgres
postgreSQL:
user: anayltic2_os_system
user: analytics_os_system
password:
valueFrom:
secretKeyRef:
key: pg_password
name: anayltic2-secrets
name: analytics-secrets
databases:
- name: anayltic2
- name: analytics
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: anayltic2-server
name: analytics-server
namespace: {{ .Release.Namespace }}
labels:
app: anayltic2-server
app: analytics-server
applications.app.bytetrade.io/author: bytetrade.io
spec:
replicas: 1
@@ -56,11 +56,11 @@ spec:
type: Recreate
selector:
matchLabels:
app: anayltic2-server
app: analytics-server
template:
metadata:
labels:
app: anayltic2-server
app: analytics-server
spec:
initContainers:
- name: init-container
@@ -76,14 +76,14 @@ spec:
- name: PGPORT
value: "5432"
- name: PGUSER
value: anayltic2_os_system
value: analytics_os_system
- name: PGPASSWORD
value: {{ $pg_password | b64dec }}
- name: PGDB
value: os_system_anayltic2
value: os_system_analytics
containers:
- name: anayltic2-server
image: beclab/analytic-api:v0.0.4
- name: analytics-server
image: beclab/analytics-api:v0.0.6
imagePullPolicy: IfNotPresent
ports:
- containerPort: 3010
@@ -97,9 +97,9 @@ spec:
- name: PL_DATA_POSTGRES_PORT
value: "5432"
- name: PL_DATA_POSTGRES_DATABASE
value: os_system_anayltic2
value: os_system_analytics
- name: PL_DATA_POSTGRES_USER
value: anayltic2_os_system
value: analytics_os_system
- name: PL_DATA_POSTGRES_PASSWORD
value: {{ $pg_password | b64dec }}
- name: DATABASE_URL
@@ -109,12 +109,12 @@ spec:
apiVersion: v1
kind: Service
metadata:
name: anayltic2-server
name: analytics-server
namespace: {{ .Release.Namespace }}
spec:
type: ClusterIP
selector:
app: anayltic2-server
app: analytics-server
ports:
- name: server
protocol: TCP
@@ -125,23 +125,23 @@ spec:
apiVersion: apr.bytetrade.io/v1alpha1
kind: SysEventRegistry
metadata:
name: anayltic2-user-create-cb
name: analytics-user-create-cb
namespace: {{ .Release.Namespace }}
spec:
type: subscriber
event: user.create
callback: http://anayltic2-server.{{ .Release.Namespace }}:3010/callback/create
callback: http://analytics-server.{{ .Release.Namespace }}:3010/callback/create
---
apiVersion: apr.bytetrade.io/v1alpha1
kind: SysEventRegistry
metadata:
name: anayltic2-user-delete-cb
name: analytics-user-delete-cb
namespace: {{ .Release.Namespace }}
spec:
type: subscriber
event: user.delete
callback: http://anayltic2-server.{{ .Release.Namespace }}:3010/callback/delete
callback: http://analytics-server.{{ .Release.Namespace }}:3010/callback/delete