refactor: prefix all third-party service names with cameleer-
All checks were successful
All checks were successful
Rename all Docker/K8s service names, DNS hostnames, secrets, volumes, and manifest files to use the cameleer- prefix, making it clear which software package each container belongs to. Services renamed: - postgres → cameleer-postgres - clickhouse → cameleer-clickhouse - logto → cameleer-logto - logto-postgresql → cameleer-logto-postgresql - traefik (service) → cameleer-traefik - postgres-external → cameleer-postgres-external Secrets renamed: - postgres-credentials → cameleer-postgres-credentials - clickhouse-credentials → cameleer-clickhouse-credentials - logto-credentials → cameleer-logto-credentials Volumes renamed: - pgdata → cameleer-pgdata - chdata → cameleer-chdata - certs → cameleer-certs - bootstrapdata → cameleer-bootstrapdata K8s manifests renamed: - deploy/postgres.yaml → deploy/cameleer-postgres.yaml - deploy/clickhouse.yaml → deploy/cameleer-clickhouse.yaml - deploy/logto.yaml → deploy/cameleer-logto.yaml Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -28,22 +28,22 @@ spec:
|
||||
- name: SPRING_DATASOURCE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
name: cameleer-postgres-credentials
|
||||
key: POSTGRES_USER
|
||||
- name: SPRING_DATASOURCE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
name: cameleer-postgres-credentials
|
||||
key: POSTGRES_PASSWORD
|
||||
- name: SPRING_FLYWAY_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
name: cameleer-postgres-credentials
|
||||
key: POSTGRES_USER
|
||||
- name: SPRING_FLYWAY_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
name: cameleer-postgres-credentials
|
||||
key: POSTGRES_PASSWORD
|
||||
- name: CAMELEER_SERVER_SECURITY_BOOTSTRAPTOKEN
|
||||
valueFrom:
|
||||
@@ -71,16 +71,16 @@ spec:
|
||||
key: CAMELEER_SERVER_SECURITY_JWTSECRET
|
||||
optional: true
|
||||
- name: CAMELEER_SERVER_CLICKHOUSE_URL
|
||||
value: "jdbc:clickhouse://clickhouse.cameleer.svc.cluster.local:8123/cameleer"
|
||||
value: "jdbc:clickhouse://cameleer-clickhouse.cameleer.svc.cluster.local:8123/cameleer"
|
||||
- name: CAMELEER_SERVER_CLICKHOUSE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: clickhouse-credentials
|
||||
name: cameleer-clickhouse-credentials
|
||||
key: CLICKHOUSE_USER
|
||||
- name: CAMELEER_SERVER_CLICKHOUSE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: clickhouse-credentials
|
||||
name: cameleer-clickhouse-credentials
|
||||
key: CLICKHOUSE_PASSWORD
|
||||
|
||||
resources:
|
||||
|
||||
@@ -1,36 +1,36 @@
|
||||
apiVersion: apps/v1
|
||||
kind: StatefulSet
|
||||
metadata:
|
||||
name: clickhouse
|
||||
name: cameleer-clickhouse
|
||||
namespace: cameleer
|
||||
spec:
|
||||
serviceName: clickhouse
|
||||
serviceName: cameleer-clickhouse
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: clickhouse
|
||||
app: cameleer-clickhouse
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: clickhouse
|
||||
app: cameleer-clickhouse
|
||||
spec:
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
runAsUser: 101
|
||||
fsGroup: 101
|
||||
containers:
|
||||
- name: clickhouse
|
||||
- name: cameleer-clickhouse
|
||||
image: clickhouse/clickhouse-server:24.12
|
||||
env:
|
||||
- name: CLICKHOUSE_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: clickhouse-credentials
|
||||
name: cameleer-clickhouse-credentials
|
||||
key: CLICKHOUSE_USER
|
||||
- name: CLICKHOUSE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: clickhouse-credentials
|
||||
name: cameleer-clickhouse-credentials
|
||||
key: CLICKHOUSE_PASSWORD
|
||||
- name: CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT
|
||||
value: "1"
|
||||
@@ -78,10 +78,10 @@ spec:
|
||||
volumes:
|
||||
- name: initdb
|
||||
configMap:
|
||||
name: clickhouse-initdb
|
||||
name: cameleer-clickhouse-initdb
|
||||
- name: config
|
||||
configMap:
|
||||
name: clickhouse-config
|
||||
name: cameleer-clickhouse-config
|
||||
volumeClaimTemplates:
|
||||
- metadata:
|
||||
name: data
|
||||
@@ -94,12 +94,12 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: clickhouse
|
||||
name: cameleer-clickhouse
|
||||
namespace: cameleer
|
||||
spec:
|
||||
clusterIP: None
|
||||
selector:
|
||||
app: clickhouse
|
||||
app: cameleer-clickhouse
|
||||
ports:
|
||||
- port: 8123
|
||||
targetPort: 8123
|
||||
@@ -111,7 +111,7 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: clickhouse-config
|
||||
name: cameleer-clickhouse-config
|
||||
namespace: cameleer
|
||||
data:
|
||||
# Server-level tuning for 4Gi container.
|
||||
@@ -199,7 +199,7 @@ data:
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: clickhouse-initdb
|
||||
name: cameleer-clickhouse-initdb
|
||||
namespace: cameleer
|
||||
data:
|
||||
01-create-database.sql: |
|
||||
@@ -1,7 +1,7 @@
|
||||
# Logto OIDC Provider for Cameleer
|
||||
# Provides external identity management with OAuth2/OIDC.
|
||||
#
|
||||
# Logto is proxy-aware: ENDPOINT and ADMIN_ENDPOINT (from logto-credentials secret)
|
||||
# Logto is proxy-aware: ENDPOINT and ADMIN_ENDPOINT (from cameleer-logto-credentials secret)
|
||||
# set the public-facing URLs that Logto advertises in OIDC discovery, redirects, etc.
|
||||
# When behind a reverse proxy (e.g., Traefik), set these to the external URLs.
|
||||
#
|
||||
@@ -16,21 +16,21 @@
|
||||
apiVersion: apps/v1
|
||||
kind: StatefulSet
|
||||
metadata:
|
||||
name: logto-postgresql
|
||||
name: cameleer-logto-postgresql
|
||||
namespace: cameleer
|
||||
spec:
|
||||
serviceName: logto-postgresql
|
||||
serviceName: cameleer-logto-postgresql
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: logto-postgresql
|
||||
app: cameleer-logto-postgresql
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: logto-postgresql
|
||||
app: cameleer-logto-postgresql
|
||||
spec:
|
||||
containers:
|
||||
- name: postgresql
|
||||
- name: cameleer-logto-postgresql
|
||||
image: postgres:16-alpine
|
||||
ports:
|
||||
- containerPort: 5432
|
||||
@@ -40,12 +40,12 @@ spec:
|
||||
- name: POSTGRES_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: logto-credentials
|
||||
name: cameleer-logto-credentials
|
||||
key: PG_USER
|
||||
- name: POSTGRES_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: logto-credentials
|
||||
name: cameleer-logto-credentials
|
||||
key: PG_PASSWORD
|
||||
volumeMounts:
|
||||
- name: data
|
||||
@@ -80,12 +80,12 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: logto-postgresql
|
||||
name: cameleer-logto-postgresql
|
||||
namespace: cameleer
|
||||
spec:
|
||||
clusterIP: None
|
||||
selector:
|
||||
app: logto-postgresql
|
||||
app: cameleer-logto-postgresql
|
||||
ports:
|
||||
- port: 5432
|
||||
targetPort: 5432
|
||||
@@ -95,20 +95,20 @@ spec:
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: logto
|
||||
name: cameleer-logto
|
||||
namespace: cameleer
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: logto
|
||||
app: cameleer-logto
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: logto
|
||||
app: cameleer-logto
|
||||
spec:
|
||||
containers:
|
||||
- name: logto
|
||||
- name: cameleer-logto
|
||||
image: ghcr.io/logto-io/logto:latest
|
||||
command: ["sh", "-c", "npm run cli db seed -- --swe && npm start"]
|
||||
ports:
|
||||
@@ -122,24 +122,24 @@ spec:
|
||||
- name: PG_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: logto-credentials
|
||||
name: cameleer-logto-credentials
|
||||
key: PG_USER
|
||||
- name: PG_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: logto-credentials
|
||||
name: cameleer-logto-credentials
|
||||
key: PG_PASSWORD
|
||||
- name: DB_URL
|
||||
value: "postgresql://$(PG_USER):$(PG_PASSWORD)@logto-postgresql:5432/logto"
|
||||
value: "postgresql://$(PG_USER):$(PG_PASSWORD)@cameleer-logto-postgresql:5432/logto"
|
||||
- name: ENDPOINT
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: logto-credentials
|
||||
name: cameleer-logto-credentials
|
||||
key: ENDPOINT
|
||||
- name: ADMIN_ENDPOINT
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: logto-credentials
|
||||
name: cameleer-logto-credentials
|
||||
key: ADMIN_ENDPOINT
|
||||
resources:
|
||||
requests:
|
||||
@@ -168,12 +168,12 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: logto
|
||||
name: cameleer-logto
|
||||
namespace: cameleer
|
||||
spec:
|
||||
type: NodePort
|
||||
selector:
|
||||
app: logto
|
||||
app: cameleer-logto
|
||||
ports:
|
||||
- port: 3001
|
||||
targetPort: 3001
|
||||
@@ -1,41 +1,41 @@
|
||||
apiVersion: apps/v1
|
||||
kind: StatefulSet
|
||||
metadata:
|
||||
name: postgres
|
||||
name: cameleer-postgres
|
||||
namespace: cameleer
|
||||
spec:
|
||||
serviceName: postgres
|
||||
serviceName: cameleer-postgres
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: postgres
|
||||
app: cameleer-postgres
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: postgres
|
||||
app: cameleer-postgres
|
||||
spec:
|
||||
securityContext:
|
||||
runAsNonRoot: true
|
||||
runAsUser: 999
|
||||
fsGroup: 999
|
||||
containers:
|
||||
- name: postgres
|
||||
- name: cameleer-postgres
|
||||
image: postgres:16
|
||||
ports:
|
||||
- containerPort: 5432
|
||||
name: postgres
|
||||
name: cameleer-pg
|
||||
env:
|
||||
- name: POSTGRES_DB
|
||||
value: cameleer3
|
||||
- name: POSTGRES_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
name: cameleer-postgres-credentials
|
||||
key: POSTGRES_USER
|
||||
- name: POSTGRES_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
name: cameleer-postgres-credentials
|
||||
key: POSTGRES_PASSWORD
|
||||
volumeMounts:
|
||||
- name: data
|
||||
@@ -79,26 +79,26 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: postgres
|
||||
name: cameleer-postgres
|
||||
namespace: cameleer
|
||||
spec:
|
||||
clusterIP: None
|
||||
selector:
|
||||
app: postgres
|
||||
app: cameleer-postgres
|
||||
ports:
|
||||
- port: 5432
|
||||
targetPort: 5432
|
||||
name: postgres
|
||||
name: cameleer-pg
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: postgres-external
|
||||
name: cameleer-postgres-external
|
||||
namespace: cameleer
|
||||
spec:
|
||||
type: NodePort
|
||||
selector:
|
||||
app: postgres
|
||||
app: cameleer-postgres
|
||||
ports:
|
||||
- port: 5432
|
||||
targetPort: 5432
|
||||
@@ -13,18 +13,18 @@ spec:
|
||||
args:
|
||||
- |
|
||||
PGPASSWORD=$POSTGRES_PASSWORD psql \
|
||||
-h postgres.cameleer.svc.cluster.local \
|
||||
-h cameleer-postgres.cameleer.svc.cluster.local \
|
||||
-U $POSTGRES_USER -d cameleer3 \
|
||||
-c "CREATE SCHEMA IF NOT EXISTS BRANCH_SCHEMA"
|
||||
env:
|
||||
- name: POSTGRES_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
name: cameleer-postgres-credentials
|
||||
key: POSTGRES_USER
|
||||
- name: POSTGRES_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
name: cameleer-postgres-credentials
|
||||
key: POSTGRES_PASSWORD
|
||||
backoffLimit: 3
|
||||
|
||||
@@ -24,7 +24,7 @@ patches:
|
||||
- name: server
|
||||
env:
|
||||
- name: SPRING_DATASOURCE_URL
|
||||
value: "jdbc:postgresql://postgres.cameleer.svc.cluster.local:5432/cameleer3?currentSchema=BRANCH_SCHEMA"
|
||||
value: "jdbc:postgresql://cameleer-postgres.cameleer.svc.cluster.local:5432/cameleer3?currentSchema=BRANCH_SCHEMA"
|
||||
- name: CAMELEER_SERVER_SECURITY_UIORIGIN
|
||||
value: "http://BRANCH_SLUG.cameleer.siegeln.net"
|
||||
# UI ConfigMap: branch-specific API URL
|
||||
|
||||
@@ -41,7 +41,7 @@ patches:
|
||||
- name: CAMELEER_SERVER_SECURITY_UIORIGIN
|
||||
value: "http://192.168.50.86:30090"
|
||||
- name: SPRING_DATASOURCE_URL
|
||||
value: "jdbc:postgresql://postgres:5432/cameleer3?currentSchema=public"
|
||||
value: "jdbc:postgresql://cameleer-postgres:5432/cameleer3?currentSchema=public"
|
||||
# UI ConfigMap: production API URL
|
||||
- target:
|
||||
kind: ConfigMap
|
||||
|
||||
Reference in New Issue
Block a user