Revert database pvc annotation changes

2026-03-10 08:11:21 +00:00 · 2022-04-29 16:35:11 +02:00
parent e3439eff8e
commit ea6d0ecb44
9 changed files with 17 additions and 8 deletions
--- a/lib/aws/chart_values/mongodb/q-values.j2.yaml
+++ b/lib/aws/chart_values/mongodb/q-values.j2.yaml
@@ -344,9 +344,10 @@ persistence:
    - ReadWriteOnce
  size: {{ database_disk_size_in_gib }}Gi
  annotations:
+    ownerId: {{ owner_id }}
    envId: {{ environment_id }}
    databaseId: {{ id }}
-    databaseLongId: {{ long_id }}
+    databaseName: {{ sanitized_name }}

 ## Configure the ingress resource that allows you to access the
 ## MongoDB installation. Set up the URL
--- a/lib/aws/chart_values/mysql/q-values.j2.yaml
+++ b/lib/aws/chart_values/mysql/q-values.j2.yaml
@@ -314,9 +314,10 @@ master:
    ## PVC annotations
    ##
    annotations:
+      ownerId: {{ owner_id }}
      envId: {{ environment_id }}
      databaseId: {{ id }}
-      databaseLongId: {{ long_id }}
+      databaseName: {{ sanitized_name }}

    ## Persistent Volume Access Mode
    ##
--- a/lib/aws/chart_values/postgresql/q-values.j2.yaml
+++ b/lib/aws/chart_values/postgresql/q-values.j2.yaml
@@ -326,6 +326,7 @@ persistence:
    - ReadWriteOnce
  size: {{ database_disk_size_in_gib }}Gi
  annotations:
+    ownerId: {{ owner_id }}
    envId: {{ environment_id }}
    databaseId: {{ id }}
    databaseLongId: {{ long_id }}
--- a/lib/digitalocean/chart_values/mongodb/q-values.j2.yaml
+++ b/lib/digitalocean/chart_values/mongodb/q-values.j2.yaml
@@ -347,9 +347,10 @@ persistence:
    - ReadWriteOnce
  size: {{ database_disk_size_in_gib }}Gi
  annotations:
+    ownerId: {{ owner_id }}
    envId: {{ environment_id }}
    databaseId: {{ id }}
-    databaseLongId: {{ long_id }}
+    databaseName: '{{ sanitized_name }}'

 ## Configure the ingress resource that allows you to access the
 ## MongoDB installation. Set up the URL
--- a/lib/digitalocean/chart_values/mysql/q-values.j2.yaml
+++ b/lib/digitalocean/chart_values/mysql/q-values.j2.yaml
@@ -314,9 +314,10 @@ master:
    ## PVC annotations
    ##
    annotations:
+      ownerId: {{ owner_id }}
      envId: {{ environment_id }}
      databaseId: {{ id }}
-      databaseLongId: {{ long_id }}
+      databaseName: '{{ sanitized_name }}'

    ## Persistent Volume Access Mode
    ##
--- a/lib/digitalocean/chart_values/postgresql/q-values.j2.yaml
+++ b/lib/digitalocean/chart_values/postgresql/q-values.j2.yaml
@@ -328,9 +328,10 @@ persistence:
    - ReadWriteOnce
  size: {{ database_disk_size_in_gib }}Gi
  annotations:
+    ownerId: {{ owner_id }}
    envId: {{ environment_id }}
    databaseId: {{ id }}
-    databaseLongId: {{ long_id }}
+    databaseName: '{{ sanitized_name }}'

 ## updateStrategy for PostgreSQL StatefulSet and its slaves StatefulSets
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
--- a/lib/scaleway/chart_values/mongodb/q-values.j2.yaml
+++ b/lib/scaleway/chart_values/mongodb/q-values.j2.yaml
@@ -196,9 +196,10 @@ persistence:
    - ReadWriteOnce
  size: {{ database_disk_size_in_gib }}Gi
  annotations:
+    ownerId: {{ owner_id }}
    envId: {{ environment_id }}
    databaseId: {{ id }}
-    databaseLongId: {{ long_id }}
+    databaseName: '{{ sanitized_name }}'
    # volume.beta.kubernetes.io/storage-class=scw-sbv-ssd-0:

 ## Prometheus Exporter / Metrics
--- a/lib/scaleway/chart_values/mysql/q-values.j2.yaml
+++ b/lib/scaleway/chart_values/mysql/q-values.j2.yaml
@@ -292,9 +292,10 @@ master:
    ## PVC annotations
    ##
    annotations:
+      ownerId: {{ owner_id }}
      envId: {{ environment_id }}
      databaseId: {{ id }}
-      databaseLongId: {{ long_id }}
+      databaseName: '{{ sanitized_name }}'

    ## Persistent Volume Access Mode
    ##
--- a/lib/scaleway/chart_values/postgresql/q-values.j2.yaml
+++ b/lib/scaleway/chart_values/postgresql/q-values.j2.yaml
@@ -169,9 +169,10 @@ persistence:
    - ReadWriteOnce
  size: {{ database_disk_size_in_gib }}Gi
  annotations:
+    ownerId: {{ owner_id }}
    envId: {{ environment_id }}
    databaseId: {{ id }}
-    databaseLongId: {{ long_id }}
+    databaseName: '{{ sanitized_name }}'

 ##
 ## PostgreSQL Master parameters