fix: use fullnameOverride

AtomiCloud · Dec 6, 2023 · 3ff12cc · 3ff12cc
1 parent 1affb32
commit 3ff12cc
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 58 deletions.
diff --git a/App/Config/settings.lapras.yaml b/App/Config/settings.lapras.yaml
@@ -26,20 +26,24 @@ Metrics:
 # Infra-based
 Database:
   MAIN:
-    Host: nitroso-zinc-main-database
+    Host: zinc-maindb
     User: admin
     Password: supersecret
     AutoMigrate: true
 
-Cache: {}
+Cache:
+  MAIN:
+    Endpoints:
+      - zinc-maincache:6379
+    Password: supersecret
 BlockStorage:
   MAIN:
     Read:
-      Host: mainstore.zinc.nitroso.lapras.lvh.me
+      Host: mainstorage.zinc.nitroso.lapras.lvh.me
       Port: 20010
       Scheme: http
     Write:
-      Host: nitroso-zinc-main-storage
+      Host: zinc-mainstorage
       Port: 9000
       Scheme: http
     Policy: Private

diff --git a/App/Config/settings.yaml b/App/Config/settings.yaml
@@ -119,35 +119,36 @@ Metrics:
 # Infra-based
 Database:
   MAIN:
-    Database: nitroso-zinc
-    AutoMigrate: false
-    Host: nitroso-zinc-main-database
-    Password: supersecret
+    Host: zinc-maindb
     User: admin
+    Password: supersecret
+    AutoMigrate: false
+    Database: nitroso-zinc
     Port: 5432
     Timeout: 60
 Cache:
   MAIN:
+    Endpoints:
+      - zinc-maincache:6379
+    Password: supersecret
+
     ConnectTimeout: 5000
     AbortConnect: true
     AllowAdmin: false
     ConnectRetry: 3
-    Password: supersecret
     SSL: false
     SyncTimeout: 5000
-    Endpoints:
-      - nitroso-zinc-main-cache:6379
 BlockStorage:
   MAIN:
     AccessKey: "admin"
     SecretKey: "supersecret"
     Bucket: "nitroso-zinc-main-storage"
     Read:
-      Host: nitroso-zinc-main-storage
+      Host: mainstorage.zinc.nitroso.lapras.lvh.me
       Port: 443
       Scheme: https
     Write:
-      Host: nitroso-zinc-main-storage
+      Host: zinc-mainstorage
       Port: 443
       Scheme: https
     Policy: Private

diff --git a/config/dev.yaml b/config/dev.yaml
@@ -12,7 +12,7 @@ type: local
 # fast mode
 # 1. does not start the cluster, automatically assumes that your cluster already created
 # 2. does not clean up resources. This makes your future starts faster
-fast: true
+fast: false
 
 # whether to start local cluster. If false, will connect to current context
 startCluster: true

diff --git a/infra/api_chart/app/settings.lapras.yaml b/infra/api_chart/app/settings.lapras.yaml
@@ -26,20 +26,24 @@ Metrics:
 # Infra-based
 Database:
   MAIN:
-    Host: nitroso-zinc-main-database
+    Host: zinc-maindb
     User: admin
     Password: supersecret
     AutoMigrate: true
 
-Cache: {}
+Cache:
+  MAIN:
+    Endpoints:
+      - zinc-maincache:6379
+    Password: supersecret
 BlockStorage:
   MAIN:
     Read:
-      Host: mainstore.zinc.nitroso.lapras.lvh.me
+      Host: mainstorage.zinc.nitroso.lapras.lvh.me
       Port: 20010
       Scheme: http
     Write:
-      Host: nitroso-zinc-main-storage
+      Host: zinc-mainstorage
       Port: 9000
       Scheme: http
     Policy: Private

diff --git a/infra/api_chart/app/settings.yaml b/infra/api_chart/app/settings.yaml
@@ -119,35 +119,36 @@ Metrics:
 # Infra-based
 Database:
   MAIN:
-    Database: nitroso-zinc
-    AutoMigrate: false
-    Host: nitroso-zinc-main-database
-    Password: supersecret
+    Host: zinc-maindb
     User: admin
+    Password: supersecret
+    AutoMigrate: false
+    Database: nitroso-zinc
     Port: 5432
     Timeout: 60
 Cache:
   MAIN:
+    Endpoints:
+      - zinc-maincache:6379
+    Password: supersecret
+
     ConnectTimeout: 5000
     AbortConnect: true
     AllowAdmin: false
     ConnectRetry: 3
-    Password: supersecret
     SSL: false
     SyncTimeout: 5000
-    Endpoints:
-      - nitroso-zinc-main-cache:6379
 BlockStorage:
   MAIN:
     AccessKey: "admin"
     SecretKey: "supersecret"
     Bucket: "nitroso-zinc-main-storage"
     Read:
-      Host: nitroso-zinc-main-storage
+      Host: mainstorage.zinc.nitroso.lapras.lvh.me
       Port: 443
       Scheme: https
     Write:
-      Host: nitroso-zinc-main-storage
+      Host: zinc-mainstorage
       Port: 443
       Scheme: https
     Policy: Private

diff --git a/infra/migration_chart/app/settings.lapras.yaml b/infra/migration_chart/app/settings.lapras.yaml
@@ -26,20 +26,24 @@ Metrics:
 # Infra-based
 Database:
   MAIN:
-    Host: nitroso-zinc-main-database
+    Host: zinc-maindb
     User: admin
     Password: supersecret
     AutoMigrate: true
 
-Cache: {}
+Cache:
+  MAIN:
+    Endpoints:
+      - zinc-maincache:6379
+    Password: supersecret
 BlockStorage:
   MAIN:
     Read:
-      Host: mainstore.zinc.nitroso.lapras.lvh.me
+      Host: mainstorage.zinc.nitroso.lapras.lvh.me
       Port: 20010
       Scheme: http
     Write:
-      Host: nitroso-zinc-main-storage
+      Host: zinc-mainstorage
       Port: 9000
       Scheme: http
     Policy: Private

diff --git a/infra/migration_chart/app/settings.yaml b/infra/migration_chart/app/settings.yaml
@@ -119,35 +119,36 @@ Metrics:
 # Infra-based
 Database:
   MAIN:
-    Database: nitroso-zinc
-    AutoMigrate: false
-    Host: nitroso-zinc-main-database
-    Password: supersecret
+    Host: zinc-maindb
     User: admin
+    Password: supersecret
+    AutoMigrate: false
+    Database: nitroso-zinc
     Port: 5432
     Timeout: 60
 Cache:
   MAIN:
+    Endpoints:
+      - zinc-maincache:6379
+    Password: supersecret
+
     ConnectTimeout: 5000
     AbortConnect: true
     AllowAdmin: false
     ConnectRetry: 3
-    Password: supersecret
     SSL: false
     SyncTimeout: 5000
-    Endpoints:
-      - nitroso-zinc-main-cache:6379
 BlockStorage:
   MAIN:
     AccessKey: "admin"
     SecretKey: "supersecret"
     Bucket: "nitroso-zinc-main-storage"
     Read:
-      Host: nitroso-zinc-main-storage
+      Host: mainstorage.zinc.nitroso.lapras.lvh.me
       Port: 443
       Scheme: https
     Write:
-      Host: nitroso-zinc-main-storage
+      Host: zinc-mainstorage
       Port: 443
       Scheme: https
     Policy: Private

diff --git a/infra/root_chart/README.md b/infra/root_chart/README.md
@@ -25,7 +25,7 @@ Root Chart to a single Service
 | api.autoscaling | object | `{}` |  |
 | api.configMountPath | string | `"/app/Config"` |  |
 | api.enabled | bool | `true` |  |
-| api.fullnameOverride | string | `""` |  |
+| api.fullnameOverride | string | `"zinc-api"` |  |
 | api.image.pullPolicy | string | `"IfNotPresent"` |  |
 | api.image.repository | string | `"nitroso-zinc-api"` |  |
 | api.image.tag | string | `""` |  |
@@ -40,7 +40,6 @@ Root Chart to a single Service
 | api.ingress.tls[0].secretName | string | `"sample"` |  |
 | api.livenessProbe.httpGet.path | string | `"/"` |  |
 | api.livenessProbe.httpGet.port | string | `"http"` |  |
-| api.nameOverride | string | `"api"` |  |
 | api.nodeSelector | object | `{}` |  |
 | api.podAnnotations | object | `{}` |  |
 | api.podSecurityContext | object | `{}` |  |
@@ -71,22 +70,22 @@ Root Chart to a single Service
 | bromine.rootSecret.ref | string | `"NITROSO_ZINC"` | DOPPLER Token Reference |
 | bromine.storeName | string | `"nitroso-zinc"` | Store name to create |
 | maincache.extraArgs[0] | string | `"--requirepass=supersecret"` |  |
-| maincache.nameOverride | string | `"main-cache"` |  |
+| maincache.fullnameOverride | string | `"zinc-maincache"` |  |
 | maincache.storage.enabled | bool | `false` |  |
 | maindb.auth.database | string | `"nitroso-zinc"` |  |
 | maindb.auth.password | string | `"supersecret"` |  |
 | maindb.auth.username | string | `"admin"` |  |
-| maindb.nameOverride | string | `"main-database"` |  |
+| maindb.fullnameOverride | string | `"zinc-maindb"` |  |
 | maindb.primary.persistence.enabled | bool | `false` |  |
 | mainstorage.apiIngress.enabled | bool | `true` |  |
-| mainstorage.apiIngress.hostname | string | `"mainstore.zinc.nitroso.lapras.lvh.me"` |  |
+| mainstorage.apiIngress.hostname | string | `"mainstorage.zinc.nitroso.lapras.lvh.me"` |  |
 | mainstorage.apiIngress.ingressClassName | string | `"traefik"` |  |
 | mainstorage.auth.rootPassword | string | `"supersecret"` |  |
 | mainstorage.auth.rootUser | string | `"admin"` |  |
+| mainstorage.fullnameOverride | string | `"zinc-mainstorage"` |  |
 | mainstorage.ingress.enabled | bool | `true` |  |
-| mainstorage.ingress.hostname | string | `"console-mainstore.zinc.nitroso.lapras.lvh.me"` |  |
+| mainstorage.ingress.hostname | string | `"console-mainstorage.zinc.nitroso.lapras.lvh.me"` |  |
 | mainstorage.ingress.ingressClassName | string | `"traefik"` |  |
-| mainstorage.nameOverride | string | `"main-storage"` |  |
 | mainstorage.persistence.enabled | bool | `false` |  |
 | mainstorage.persistence.size | string | `"10Gi"` |  |
 | migration.affinity | object | `{}` |  |
@@ -96,12 +95,11 @@ Root Chart to a single Service
 | migration.backoffLimit | int | `4` |  |
 | migration.configMountPath | string | `"/app/Config"` |  |
 | migration.enabled | bool | `false` |  |
-| migration.fullnameOverride | string | `""` |  |
+| migration.fullnameOverride | string | `"zinc-migration"` |  |
 | migration.image.pullPolicy | string | `"IfNotPresent"` |  |
 | migration.image.repository | string | `"nitroso-zinc-migration"` |  |
 | migration.image.tag | string | `""` |  |
 | migration.imagePullSecrets | list | `[]` |  |
-| migration.nameOverride | string | `"migration"` |  |
 | migration.nodeSelector | object | `{}` |  |
 | migration.podAnnotations | object | `{}` |  |
 | migration.podSecurityContext | object | `{}` |  |

diff --git a/infra/root_chart/values.yaml b/infra/root_chart/values.yaml
@@ -19,8 +19,8 @@ api:
   enabled: true
   annotations:
     argocd.argoproj.io/sync-wave: "4"
-  nameOverride: "api"
-  fullnameOverride: ""
+
+  fullnameOverride: "zinc-api"
 
   serviceTree:
     <<: *serviceTree
@@ -103,8 +103,7 @@ migration:
   annotations:
     argocd.argoproj.io/sync-wave: "3"
   enabled: false
-  nameOverride: "migration"
-  fullnameOverride: ""
+  fullnameOverride: "zinc-migration"
 
   serviceTree:
     <<: *serviceTree
@@ -154,7 +153,7 @@ migration:
   topologySpreadConstraints: {}
 
 maindb:
-  nameOverride: main-database
+  fullnameOverride: zinc-maindb
   primary:
     persistence:
       enabled: false
@@ -164,24 +163,24 @@ maindb:
     password: supersecret
 
 mainstorage:
-  nameOverride: "main-storage"
+  fullnameOverride: zinc-mainstorage
   persistence:
     enabled: false
     size: 10Gi
   ingress:
     enabled: true
     ingressClassName: traefik
-    hostname: console-mainstore.zinc.nitroso.lapras.lvh.me
+    hostname: console-mainstorage.zinc.nitroso.lapras.lvh.me
   apiIngress:
     enabled: true
     ingressClassName: traefik
-    hostname: mainstore.zinc.nitroso.lapras.lvh.me
+    hostname: mainstorage.zinc.nitroso.lapras.lvh.me
   auth:
     rootUser: admin
     rootPassword: supersecret
 
 maincache:
-  nameOverride: main-cache
+  fullnameOverride: zinc-maincache
   storage:
     enabled: false
   extraArgs: