diff --git a/apps/apps/dify/helmchart.yaml b/apps/apps/dify/helmchart.yaml new file mode 100644 index 0000000..70d401a --- /dev/null +++ b/apps/apps/dify/helmchart.yaml @@ -0,0 +1,63 @@ +apiVersion: helm.cattle.io/v1 +kind: HelmChart +metadata: + name: halo + namespace: apps +spec: + repo: https://borispolonsky.github.io/dify-helm + chart: dify + targetNamespace: apps + version: 0.24.0 + valuesContent: |- + nodeSelector: + kubernetes.io/hostname: greenhk + api: + persistence: + enabled: true + storageClass: local-path + accessMode: ReadWriteMany + size: 10Gi + extraEnv: + - name: LANG + value: "C.UTF-8" + postgresql: + enabled: false + redis: + enabled: false + weaviate: + enabled: false + externalPostgres: + enabled: true + username: app + password: nyrHzh9WWlDZzvVw7bDFo74gKb9zsls0Sy7OwRTDWiRTNPQQQkW85taUFAoX2AIC + address: cnpg-cluster-hk-rw.infra-data + port: 5432 + database: + api: dify + pluginDaemon: dify_plugin + externalPgvector: + enabled: false + username: app + password: nyrHzh9WWlDZzvVw7bDFo74gKb9zsls0Sy7OwRTDWiRTNPQQQkW85taUFAoX2AIC + address: cnpg-cluster-hk-rw.infra-data + port: 5432 + dbName: dify + externalRedis: + enabled: true + host: redis.example + port: 6379 + username: "" + password: ribiPwYQNU6GWxCYR0Nj + useSSL: false + proxy: + enable: false + ingress: + enabled: true + className: nginx + hosts: + - host: dify.dev.cm + paths: + - path: / + pathType: ImplementationSpecific + + diff --git a/apps/apps/halo/helmchart.yaml b/apps/apps/halo/helmchart.yaml index 93f5c98..1c2a21c 100644 --- a/apps/apps/halo/helmchart.yaml +++ b/apps/apps/halo/helmchart.yaml @@ -31,7 +31,7 @@ spec: - greenhk image: repository: halohub/halo-pro - tag: 2.20.19 + tag: 2.20.21 service: type: ClusterIP ingress: @@ -58,10 +58,10 @@ spec: enabled: false externalDatabase: platform: postgresql - host: cnpg-cluster-hk-rw.infra-data + host: cnpg17-cluster-hk-rw.infra-data port: 5432 user: app - password: nyrHzh9WWlDZzvVw7bDFo74gKb9zsls0Sy7OwRTDWiRTNPQQQkW85taUFAoX2AIC + password: QrmOnigueiiKWDxS5HqS8h765fUZoV1fj2WFkHpqZOPnKAGcM9paiXC1VzGUA3PD database: halo haloUsername: rohow haloExternalUrl: https://dev.cm diff --git a/apps/infra/data/cloudnative-pg/cnpg-cluster-hk.yaml b/apps/infra/data/cloudnative-pg/cnpg17-cluster-hk.yaml similarity index 87% rename from apps/infra/data/cloudnative-pg/cnpg-cluster-hk.yaml rename to apps/infra/data/cloudnative-pg/cnpg17-cluster-hk.yaml index fef710d..e762a43 100644 --- a/apps/infra/data/cloudnative-pg/cnpg-cluster-hk.yaml +++ b/apps/infra/data/cloudnative-pg/cnpg17-cluster-hk.yaml @@ -1,7 +1,7 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: cnpg-cluster-hk + name: cnpg17-cluster-hk namespace: infra-data spec: affinity: @@ -15,6 +15,7 @@ spec: - cn-hk weight: 1 instances: 1 + imageName: ghcr.io/tensorchord/cloudnative-pgvecto.rs:17.5-v0.4.0 enableSuperuserAccess: true storage: size: 10Gi @@ -40,11 +41,11 @@ spec: apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: cnpg-cluster-hk-backups + name: cnpg17-cluster-hk-backups namespace: infra-data spec: schedule: "0 0 0 * * *" immediate: true backupOwnerReference: self cluster: - name: cnpg-cluster-hk + name: cnpg17-cluster-hk diff --git a/apps/infra/data/cloudnative-pg/cnpg-cluster-sh.yaml b/apps/infra/data/cloudnative-pg/cnpg17-cluster-sh.yaml similarity index 87% rename from apps/infra/data/cloudnative-pg/cnpg-cluster-sh.yaml rename to apps/infra/data/cloudnative-pg/cnpg17-cluster-sh.yaml index 63a1b21..5f6c1d8 100644 --- a/apps/infra/data/cloudnative-pg/cnpg-cluster-sh.yaml +++ b/apps/infra/data/cloudnative-pg/cnpg17-cluster-sh.yaml @@ -1,7 +1,7 @@ apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: cnpg-cluster-sh + name: cnpg17-cluster-sh namespace: infra-data spec: affinity: @@ -15,6 +15,7 @@ spec: - cn-sh weight: 1 instances: 1 + imageName: ghcr.io/tensorchord/cloudnative-pgvecto.rs:17.5-v0.4.0 enableSuperuserAccess: true storage: size: 10Gi @@ -36,16 +37,15 @@ spec: wal: compression: gzip - --- apiVersion: postgresql.cnpg.io/v1 kind: ScheduledBackup metadata: - name: cnpg-cluster-sh-backups + name: cnpg17-cluster-sh-backups namespace: infra-data spec: schedule: "0 0 0 * * *" immediate: true backupOwnerReference: self cluster: - name: cnpg-cluster-sh + name: cnpg17-cluster-sh diff --git a/apps/infra/data/cloudnative-pg/loadbalancer-hk.yaml b/apps/infra/data/cloudnative-pg/loadbalancer-hk.yaml index a58699e..85f9d65 100644 --- a/apps/infra/data/cloudnative-pg/loadbalancer-hk.yaml +++ b/apps/infra/data/cloudnative-pg/loadbalancer-hk.yaml @@ -1,14 +1,14 @@ apiVersion: v1 kind: Service metadata: - name: cnpg-cluster-hk-lb + name: cnpg17-cluster-hk-lb namespace: infra-data spec: selector: - cnpg.io/cluster: cnpg-cluster-hk + cnpg.io/cluster: cnpg17-cluster-hk role: primary ports: - protocol: TCP port: 65432 targetPort: 5432 - type: LoadBalancer \ No newline at end of file + type: LoadBalancer diff --git a/apps/infra/data/cloudnative-pg/loadbalancer-sh.yaml b/apps/infra/data/cloudnative-pg/loadbalancer-sh.yaml index 54522ad..7b17866 100644 --- a/apps/infra/data/cloudnative-pg/loadbalancer-sh.yaml +++ b/apps/infra/data/cloudnative-pg/loadbalancer-sh.yaml @@ -1,14 +1,14 @@ apiVersion: v1 kind: Service metadata: - name: cnpg-cluster-sh-lb + name: cnpg17-cluster-sh-lb namespace: infra-data spec: selector: - cnpg.io/cluster: cnpg-cluster-sh + cnpg.io/cluster: cnpg17-cluster-sh role: primary ports: - protocol: TCP port: 65432 targetPort: 5432 - type: LoadBalancer \ No newline at end of file + type: LoadBalancer diff --git a/apps/infra/data/milvus/helmchart.yaml b/apps/infra/data/milvus/helmchart.yaml deleted file mode 100644 index 264bf86..0000000 --- a/apps/infra/data/milvus/helmchart.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: helm.cattle.io/v1 -kind: HelmChart -metadata: - name: milvus - namespace: infra-data -spec: - repo: https://zilliztech.github.io/milvus-helm/ - chart: milvus - targetNamespace: infra-data - version: 4.2.38 - valuesContent: |- - cluster: - enabled: false - etcd: - enabled: false - pulsar: - enabled: false - minio: - enabled: false - tls: - enabled: false - extraConfigFiles: - user.yaml: |+ - etcd: - use: - embed: true - data: - dir: /var/lib/milvus/etcd - common: - storageType: local - security: - authorizationEnabled: false - diff --git a/apps/infra/data/milvus/loadbalancer.yaml b/apps/infra/data/milvus/loadbalancer.yaml deleted file mode 100644 index d7c3a62..0000000 --- a/apps/infra/data/milvus/loadbalancer.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: milvus-lb - namespace: infra-data -spec: - selector: - app.kubernetes.io/name: milvus - app.kubernetes.io/instance: milvus - component: standalone - ports: - - protocol: TCP - port: 19530 - targetPort: 19530 - type: LoadBalancer diff --git a/apps/infra/data/redis/helmchart-hk.yaml b/apps/infra/data/redis/helmchart-hk.yaml new file mode 100644 index 0000000..93f1041 --- /dev/null +++ b/apps/infra/data/redis/helmchart-hk.yaml @@ -0,0 +1,28 @@ +apiVersion: helm.cattle.io/v1 +kind: HelmChart +metadata: + name: redis-cluster-hk + namespace: infra-data +spec: + chart: oci://registry-1.docker.io/bitnamicharts/redis + targetNamespace: infra-data + version: 20.7.0 + valuesContent: |- + global: + redis: + password: ribiPwYQNU6GWxCYR0Nj + master: + nodeAffinityPreset: + type: soft + key: topology.kubernetes.io/region + values: + - cn-hk + replica: + replicaCount: 0 + nodeAffinityPreset: + type: soft + key: topology.kubernetes.io/region + values: + - cn-hk + + diff --git a/apps/infra/data/redis/helmchart.yaml b/apps/infra/data/redis/helmchart-sh.yaml similarity index 56% rename from apps/infra/data/redis/helmchart.yaml rename to apps/infra/data/redis/helmchart-sh.yaml index 7eba727..d45f457 100644 --- a/apps/infra/data/redis/helmchart.yaml +++ b/apps/infra/data/redis/helmchart-sh.yaml @@ -11,7 +11,18 @@ spec: global: redis: password: ribiPwYQNU6GWxCYR0Nj + master: + nodeAffinityPreset: + type: soft + key: topology.kubernetes.io/region + values: + - cn-sh replica: replicaCount: 0 + nodeAffinityPreset: + type: soft + key: topology.kubernetes.io/region + values: + - cn-sh diff --git a/apps/infra/devops/gitea/helmchart.yaml b/apps/infra/devops/gitea/helmchart.yaml index 6c3a430..7c3072f 100644 --- a/apps/infra/devops/gitea/helmchart.yaml +++ b/apps/infra/devops/gitea/helmchart.yaml @@ -58,10 +58,10 @@ spec: ROOT_URL: https://git.dev.cm/ database: DB_TYPE: postgres - HOST: cnpg-cluster-sh-rw.infra-data:5432 + HOST: cnpg17-cluster-sh-rw.infra-data:5432 NAME: gitea USER: app - PASSWD: 6UeWq0EEQaP47eMjAt3hmmquGY3e6bqDanCeSKWDmLtLCuMe1TH0UGTKuaw2LfIO + PASSWD: HueUoQx05DM0ICBPu1GrmBvBXE6NO3poKE6yPqokPv3dPpWvWRLAr3RXSpaL3AZd SSL_MODE: disable session: PROVIDER: redis diff --git a/apps/infra/monitor/prometheus/helmchart.yaml b/apps/infra/monitor/prometheus/helmchart.yaml index 1e1341c..cb01670 100644 --- a/apps/infra/monitor/prometheus/helmchart.yaml +++ b/apps/infra/monitor/prometheus/helmchart.yaml @@ -44,10 +44,10 @@ spec: news_feed_enabled: false database: type: postgres - host: cnpg-cluster-hk-rw.infra-data:5432 + host: cnpg17-cluster-hk-rw.infra-data:5432 name: grafana user: app - password: nyrHzh9WWlDZzvVw7bDFo74gKb9zsls0Sy7OwRTDWiRTNPQQQkW85taUFAoX2AIC + password: QrmOnigueiiKWDxS5HqS8h765fUZoV1fj2WFkHpqZOPnKAGcM9paiXC1VzGUA3PD persistence: type: pvc enabled: true diff --git a/apps/infra/net/crowdsec/helmchart.yaml b/apps/infra/net/crowdsec/helmchart.yaml index b0882c8..17c6877 100644 --- a/apps/infra/net/crowdsec/helmchart.yaml +++ b/apps/infra/net/crowdsec/helmchart.yaml @@ -91,11 +91,11 @@ spec: config.yaml.local: | db_config: type: postgresql - host: cnpg-cluster-hk-rw.infra-data + host: cnpg17-cluster-hk-rw.infra-data port: 5432 db_name: crowdsec user: app - password: nyrHzh9WWlDZzvVw7bDFo74gKb9zsls0Sy7OwRTDWiRTNPQQQkW85taUFAoX2AIC + password: QrmOnigueiiKWDxS5HqS8h765fUZoV1fj2WFkHpqZOPnKAGcM9paiXC1VzGUA3PD sslmode: require api: server: