From 07d38c8769052f9cb5f1dad59fd3d8f380b9d9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Thu, 16 May 2024 19:02:57 +0200 Subject: [PATCH] fix --- apps/wordpress/database.tf | 13 +++++++------ apps/wordpress/index.yaml | 30 +++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/apps/wordpress/database.tf b/apps/wordpress/database.tf index 520ed3c..fe9fc84 100644 --- a/apps/wordpress/database.tf +++ b/apps/wordpress/database.tf @@ -1,9 +1,9 @@ resource "random_password" "mysql_root_pass" { - length = 32 + length = 16 special = false } resource "random_password" "mysql_comp_pass" { - length = 32 + length = 16 special = false } locals { @@ -33,23 +33,24 @@ resource "kubectl_manifest" "ndb" { labels: ${jsonencode(local.db_labels)} namespace: ${var.namespace} spec: - redundancyLevel: 1 + redundancyLevel: "${var.ndb.redundancyLevel}" dataNode: - nodeCount: 1 + nodeCount: "${var.ndb.dataNode.count}" pvcSpec: accessModes: - ReadWriteOnce resources: requests: - storage: 10Gi + storage: "${var.storage.ndb.size}" mysqlNode: - nodeCount: 1 + nodeCount: "${var.ndb.mysqlNode.count}" rootPasswordSecretName: ${kubectl_manifest.mysql_root_pass.name} myCnf: | [mysqld] default_storage_engine=NDBCLUSTER EOF } + resource "time_sleep" "wait_ndb_ready" { depends_on = [kubectl_manifest.ndb] create_duration = "180s" diff --git a/apps/wordpress/index.yaml b/apps/wordpress/index.yaml index e54ff54..df0cb3d 100644 --- a/apps/wordpress/index.yaml +++ b/apps/wordpress/index.yaml @@ -368,11 +368,35 @@ options: type: string ndb: default: - replicas: 1 + dataNode: + count: 1 + mysqlNode: + count: 1 + redundancyLevel: 1 examples: - - replicas: 1 + - dataNode: + count: 1 + mysqlNode: + count: 1 + redundancyLevel: 1 properties: - replicas: + dataNode: + default: + count: 1 + properties: + count: + default: 1 + type: integer + type: object + mysqlNode: + default: + count: 1 + properties: + count: + default: 1 + type: integer + type: object + redundancyLevel: default: 1 type: integer type: object