[cinder][pxc-db] Add support for PXC galera cluster

Add default values for pxc-db chart dependency Update mysql-metrics and utils charts to support galera cluster
sapcc · Jan 27, 2025 · 50ef9bc · 50ef9bc
1 parent c700ef2
commit 50ef9bc
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 14 deletions.
diff --git a/openstack/cinder/Chart.lock b/openstack/cinder/Chart.lock
@@ -1,13 +1,16 @@
 dependencies:
 - name: utils
   repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
-  version: 0.18.4
+  version: 0.21.0
 - name: mariadb
   repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
   version: 0.14.2
+- name: pxc-db
+  repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
+  version: 0.2.13
 - name: mysql_metrics
   repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
-  version: 0.3.5
+  version: 0.4.2
 - name: memcached
   repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
   version: 0.5.3
@@ -22,6 +25,6 @@ dependencies:
   version: 1.0.0
 - name: linkerd-support
   repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
-  version: 1.0.0
-digest: sha256:49c61b998768421d8cdd026a0c886ec850bfcdc9ed89204f64c812470605b17b
-generated: "2024-09-27T14:13:49.162697106+02:00"
+  version: 1.1.0
+digest: sha256:5c7c3c8d63ceedb2f3867623aeae4f9efe61a864b7d479bb6bce56bb2f8d3640
+generated: "2025-01-27T15:16:34.872957+02:00"
diff --git a/openstack/cinder/Chart.yaml b/openstack/cinder/Chart.yaml
@@ -1,19 +1,25 @@
+---
 apiVersion: v2
 description: A Helm chart for Kubernetes
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_mascot.png
 name: cinder
-version: 0.2.1
+version: 0.3.0
 dependencies:
   - name: utils
     repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
-    version: ~0.18.4
-  - name: mariadb
+    version: ~0.21.0
+  - condition: mariadb.enabled
+    name: mariadb
     repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
     version: 0.14.2
-    condition: mariadb.enabled
+  - condition: pxc_db.enabled
+    name: pxc-db
+    alias: pxc_db
+    repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
+    version: 0.2.13
   - name: mysql_metrics
     repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
-    version: 0.3.5
+    version: 0.4.2
     condition: mariadb.enabled
   - name: memcached
     repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm

diff --git a/openstack/cinder/ci/test-values.yaml b/openstack/cinder/ci/test-values.yaml
@@ -1,14 +1,16 @@
+---
 global:
   accessControlAllowOrigin: '*'
   region: regionOne
   domain: evil.corp
   registry: keppel.regionOne.cloud
+  registryAlternateRegion: other.docker.registry
   dockerHubMirror: myRegistry/dockerhub
   dockerHubMirrorAlternateRegion: myRegistry/dockerhubalternate
   tld: regionOne.cloud
   domain_seeds:
     skip_hcm_domain: false
-    
+
   cinder_service_password: topSecret
   availability_zones:
     - foo
@@ -29,6 +31,30 @@ mariadb:
       name: cinder
       password: password
 
+pxc_db:
+  enabled: true
+  users:
+    cinder:
+      password: topSecret!
+  system_users:
+    root:
+      password: topSecret!
+    xtrabackup:
+      password: topSecret!
+    monitor:
+      password: topSecret!
+    proxyadmin:
+      password: topSecret!
+    operator:
+      password: topSecret!
+    replication:
+      password: topSecret!
+  backup:
+    s3:
+      secrets:
+        aws_access_key_id: topSecret!
+        aws_secret_access_key: topSecret!
+
 rabbitmq:
   users:
     admin:

diff --git a/openstack/cinder/values.yaml b/openstack/cinder/values.yaml
@@ -6,7 +6,7 @@ global:
   dbUser: cinder
   domain_seeds:
     skip_hcm_domain: false
- 
+
   linkerd_requested: true
   osprofiler: {}
   imagePullPolicy: IfNotPresent
@@ -139,6 +139,39 @@ mariadb:
   alerts:
     support_group: compute-storage-api
 
+pxc_db:
+  enabled: false
+  name: cinder
+  initdb_job: true
+  alerts:
+    support_group: compute-storage-api
+  ccroot_user:
+    enabled: true
+  databases:
+    - cinder
+  users:
+    octavia:
+      name: cinder
+      grants:
+        - "ALL PRIVILEGES on cinder.*"
+  pxc:
+    configuration:
+      options:
+        max_connections: "2048"
+        innodb_buffer_pool_size: "2048M"
+        innodb_log_file_size: "512M"
+        connect_timeout: "15"
+    persistence:
+      size: 10Gi
+  backup:
+    enabled: true
+    s3:
+      secrets:
+        aws_access_key_id: null
+        aws_secret_access_key: null
+    pitr:
+      enabled: true
+
 max_pool_size: 15
 max_overflow: 5
 
@@ -327,7 +360,7 @@ rabbitmq:
     sidecar:
       enabled: false
   enableDetailedMetrics: true
-  enablePerObjectMetrics: true 
+  enablePerObjectMetrics: true
 rabbitmq_notifications:
   name: cinder
 logging:

diff --git a/openstack/glance/ci/test-values.yaml b/openstack/glance/ci/test-values.yaml
@@ -1,6 +1,8 @@
+---
 global:
   registry: myRegistry
   dbPassword: topSecret
+  registryAlternateRegion: other.docker.registry
   dockerHubMirror: myRegistry/dockerhub
   dockerHubMirrorAlternateRegion: myRegistry/dockerhubalternate
   glance_service_password: secret
@@ -9,7 +11,7 @@ global:
     - bar
   domain_seeds:
     skip_hcm_domain: false
-    
+
 imageVersion: rocky
 
 rabbitmq_notifications:
@@ -30,6 +32,30 @@ mariadb:
       name: backup
       password:  password
 
+pxc_db:
+  enabled: true
+  users:
+    glance:
+      password: topSecret!
+  system_users:
+    root:
+      password: topSecret!
+    xtrabackup:
+      password: topSecret!
+    monitor:
+      password: topSecret!
+    proxyadmin:
+      password: topSecret!
+    operator:
+      password: topSecret!
+    replication:
+      password: topSecret!
+  backup:
+    s3:
+      secrets:
+        aws_access_key_id: topSecret!
+        aws_secret_access_key: topSecret!
+
 rabbitmq:
   users:
     admin: