From b6a86b4491e8e8b65ce6123b8d6e72b17da9a1e9 Mon Sep 17 00:00:00 2001
From: shadowlegend <lyheng0@gmail.com>
Date: Sun, 16 Feb 2025 00:16:49 +0700
Subject: [PATCH] update resource name to prevent conflict

---
 runtime/base/deployment/sastrafilm-server.yml | 12 ++++++------
 runtime/base/dragonfly.yml                    |  2 +-
 runtime/base/postgresql.yml                   |  8 ++++----
 runtime/base/rabbitmq.yml                     |  2 +-
 runtime/base/secret.example.yml               |  9 +++++++++
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/runtime/base/deployment/sastrafilm-server.yml b/runtime/base/deployment/sastrafilm-server.yml
index bd17b81..7dfb325 100644
--- a/runtime/base/deployment/sastrafilm-server.yml
+++ b/runtime/base/deployment/sastrafilm-server.yml
@@ -65,7 +65,7 @@ spec:
 
         env:
         - name: REDIS_HOST
-          value: sastrafilm-redis.default.svc.cluster.local
+          value: sastrafilm-dragonfly.default.svc.cluster.local
         - name: REDIS_PORT
           value: "6379"
         - name: DATABASE_REPL_MASTER_PASSWORD
@@ -79,7 +79,7 @@ spec:
               key: password
               name: sastrafilm-postgres
         - name: DATABASE_REPL_MASTER_HOST
-          value: sastrafilm-postgres-rw.default.svc.cluster.local
+          value: sastrafilm-pg-rw-pooler.default.svc.cluster.local
         - name: DATABASE_REPL_MASTER_PORT
           value: "5432"
         - name: DATABASE_REPL_MASTER_USERNAME
@@ -88,7 +88,7 @@ spec:
               key: username
               name: sastrafilm-postgres
         - name: DATABASE_REPL_REPLICA_HOST
-          value: sastrafilm-postgres-ro.default.svc.cluster.local
+          value: sastrafilm-pg-ro-pooler.default.svc.cluster.local
         - name: DATABASE_REPL_REPLICA_PORT
           value: "5432"
         - name: DATABASE_REPL_REPLICA_USERNAME
@@ -184,7 +184,7 @@ spec:
 
         env: &sastrafilm-env
         - name: REDIS_HOST
-          value: sastrafilm-redis.default.svc.cluster.local
+          value: sastrafilm-dragonfly.default.svc.cluster.local
         - name: REDIS_PORT
           value: "6379"
         - name: DATABASE_REPL_MASTER_PASSWORD
@@ -198,7 +198,7 @@ spec:
               key: password
               name: sastrafilm-postgres
         - name: DATABASE_REPL_MASTER_HOST
-          value: sastrafilm-postgres-rw.default.svc.cluster.local
+          value: sastrafilm-pg-rw-pooler.default.svc.cluster.local
         - name: DATABASE_REPL_MASTER_PORT
           value: "5432"
         - name: DATABASE_REPL_MASTER_USERNAME
@@ -207,7 +207,7 @@ spec:
               key: username
               name: sastrafilm-postgres
         - name: DATABASE_REPL_REPLICA_HOST
-          value: sastrafilm-postgres-ro.default.svc.cluster.local
+          value: sastrafilm-pg-ro-pooler.default.svc.cluster.local
         - name: DATABASE_REPL_REPLICA_PORT
           value: "5432"
         - name: DATABASE_REPL_REPLICA_USERNAME
diff --git a/runtime/base/dragonfly.yml b/runtime/base/dragonfly.yml
index b16019a..d03be8f 100644
--- a/runtime/base/dragonfly.yml
+++ b/runtime/base/dragonfly.yml
@@ -2,7 +2,7 @@
 apiVersion: dragonflydb.io/v1alpha1
 kind: Dragonfly
 metadata:
-  name: sastrafilm
+  name: sastrafilm-dragonfly
   namespace: default
 spec:
   replicas: 1
diff --git a/runtime/base/postgresql.yml b/runtime/base/postgresql.yml
index ff4455c..7a5df1f 100644
--- a/runtime/base/postgresql.yml
+++ b/runtime/base/postgresql.yml
@@ -15,7 +15,7 @@ spec:
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
-  name: sastrafilm
+  name: sastrafilm-pg
   namespace: default
 spec:
   instances: 2
@@ -43,7 +43,7 @@ spec:
 apiVersion: postgresql.cnpg.io/v1
 kind: Pooler
 metadata:
-  name: sastrafilm-rw-pooler
+  name: sastrafilm-pg-rw-pooler
   namespace: default
 spec:
   cluster:
@@ -62,7 +62,7 @@ spec:
 apiVersion: postgresql.cnpg.io/v1
 kind: Pooler
 metadata:
-  name: sastrafilm-ro-pooler
+  name: sastrafilm-pg-ro-pooler
   namespace: default
 spec:
   cluster:
@@ -88,4 +88,4 @@ spec:
   method: volumeSnapshot
   backupOwnerReference: self
   cluster:
-    name: sastrafilm
+    name: sastrafilm-pg
diff --git a/runtime/base/rabbitmq.yml b/runtime/base/rabbitmq.yml
index 6cc1f2e..2516ef3 100644
--- a/runtime/base/rabbitmq.yml
+++ b/runtime/base/rabbitmq.yml
@@ -2,5 +2,5 @@
 apiVersion: rabbitmq.com/v1beta1
 kind: RabbitmqCluster
 metadata:
-  name: sastrafilm
+  name: sastrafilm-amqp
   namespace: default
diff --git a/runtime/base/secret.example.yml b/runtime/base/secret.example.yml
index 1c72c64..9b1021d 100644
--- a/runtime/base/secret.example.yml
+++ b/runtime/base/secret.example.yml
@@ -7,6 +7,15 @@ data:
   password: YWJjZGVm
   username: YWJjZGVm
 
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: zerossl-eab
+  namespace: cert-manager
+data:
+  hmacKey: YWJjZGVm
+
 ---
 apiVersion: v1
 kind: Secret