From 3767fdba8044ddf1e0cff4f0c51260d0f30aa993 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 27 Feb 2024 11:39:08 +0100 Subject: [PATCH] `icinga-stack`: Use correct product name `Icinga DB` not `Icinga DB` --- charts/icinga-stack/docs/configuration.md | 38 +++++++++---------- .../global_database_statefulset_test.yaml | 6 +-- .../tests/icingadb_deployment_test.yaml | 10 ++--- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/charts/icinga-stack/docs/configuration.md b/charts/icinga-stack/docs/configuration.md index 099f4b4..4c4f97a 100644 --- a/charts/icinga-stack/docs/configuration.md +++ b/charts/icinga-stack/docs/configuration.md @@ -99,29 +99,29 @@ These values are used by the Icinga 2 sub-chart. For configuration of Icinga 2's | `icinga2.podSecurityContext.fsGroup` | Filesystem group of the Icinga 2 pods | `number` | `5665` | | `icinga2.podSecurityContext` | Security context of the Icinga 2 pods | `map[string]string` | `{}` | -### IcingaDB values +### Icinga DB values -These values are used by the IcingaDB sub-chart. +These values are used by the Icinga DB sub-chart. | Parameter | Description | Data Type | Default | | --------- | ----------- | --------- | ------- | -| `icingadb.enabled` | Whether or not to deploy IcingaDB | `boolean` | `true` | -| `icingadb.image.repository` | Repository of the IcingaDB image | `string` | `icinga/icingadb` | -| `icingadb.image.tag` | Tag of the IcingaDB image | `string` | `1.1.0` | -| `icingadb.image.pullPolicy` | Pull policy of the IcingaDB image | `string` | `IfNotPresent` | -| `icingadb.imagePullSecrets` | Pull secrets of the IcingaDB image | `[]string` | `[]` | -| `icingadb.nameOverride` | Name override of the IcingaDB deployment | `string` | `""` | -| `icingadb.fullnameOverride` | Fullname override of the IcingaDB deployment | `string` | `""` | -| `icingadb.resources` | Resources of the IcingaDB deployment | `map[string]string` | `{}` | -| `icingadb.nodeSelector` | Node selector of the IcingaDB deployment | `map[string]string` | `{}` | -| `icingadb.tolerations` | Tolerations of the IcingaDB deployment | `[]map[string]string` | `[]` | -| `icingadb.affinity` | Affinity of the IcingaDB deployment | `map[string]string` | `{}` | -| `icingadb.serviceAccount.create` | Whether or not to create a service account for the IcingaDB deployment | `boolean` | `false` | -| `icingadb.serviceAccount.annotations` | Annotations of the IcingaDB service account | `map[string]string` | `{}` | -| `icingadb.serviceAccount.name` | Name of the IcingaDB service account | `string` | `""` | -| `icingadb.podAnnotations` | Annotations of the IcingaDB pods | `map[string]string` | `{}` | -| `icingadb.podSecurityContext` | Security context of the IcingaDB pods | `map[string]string` | `{}` | -| `icingadb.securityContext` | Security context of the IcingaDB container | `map[string]string` | `{}` | +| `icingadb.enabled` | Whether or not to deploy Icinga DB | `boolean` | `true` | +| `icingadb.image.repository` | Repository of the Icinga DB image | `string` | `icinga/icingadb` | +| `icingadb.image.tag` | Tag of the Icinga DB image | `string` | `1.1.0` | +| `icingadb.image.pullPolicy` | Pull policy of the Icinga DB image | `string` | `IfNotPresent` | +| `icingadb.imagePullSecrets` | Pull secrets of the Icinga DB image | `[]string` | `[]` | +| `icingadb.nameOverride` | Name override of the Icinga DB deployment | `string` | `""` | +| `icingadb.fullnameOverride` | Fullname override of the Icinga DB deployment | `string` | `""` | +| `icingadb.resources` | Resources of the Icinga DB deployment | `map[string]string` | `{}` | +| `icingadb.nodeSelector` | Node selector of the Icinga DB deployment | `map[string]string` | `{}` | +| `icingadb.tolerations` | Tolerations of the Icinga DB deployment | `[]map[string]string` | `[]` | +| `icingadb.affinity` | Affinity of the Icinga DB deployment | `map[string]string` | `{}` | +| `icingadb.serviceAccount.create` | Whether or not to create a service account for the Icinga DB deployment | `boolean` | `false` | +| `icingadb.serviceAccount.annotations` | Annotations of the Icinga DB service account | `map[string]string` | `{}` | +| `icingadb.serviceAccount.name` | Name of the Icinga DB service account | `string` | `""` | +| `icingadb.podAnnotations` | Annotations of the Icinga DB pods | `map[string]string` | `{}` | +| `icingadb.podSecurityContext` | Security context of the Icinga DB pods | `map[string]string` | `{}` | +| `icingadb.securityContext` | Security context of the Icinga DB container | `map[string]string` | `{}` | ### Icinga Web values diff --git a/charts/icinga-stack/tests/global_database_statefulset_test.yaml b/charts/icinga-stack/tests/global_database_statefulset_test.yaml index 892ddb2..16ff374 100644 --- a/charts/icinga-stack/tests/global_database_statefulset_test.yaml +++ b/charts/icinga-stack/tests/global_database_statefulset_test.yaml @@ -130,8 +130,8 @@ tests: - failedTemplate: errorMessage: "director password not set. Set either .Values.global.databases.director.password.value or .Values.global.databases.director.credSecret and .Values.global.databases.director.password.secretKey" - # IcingaDB DB - - it: deploys an IcingaDB database StatefulSet using values + # Icinga DB DB + - it: deploys an Icinga DB database StatefulSet using values documentIndex: 2 values: - required_values.yaml @@ -155,7 +155,7 @@ tests: name: MARIADB_PASSWORD value: insecureicingadbpassword - - it: deploys an IcingaDB database StatefulSet using secrets + - it: deploys an Icinga DB database StatefulSet using secrets documentIndex: 2 values: - required_values_secrets.yaml diff --git a/charts/icinga-stack/tests/icingadb_deployment_test.yaml b/charts/icinga-stack/tests/icingadb_deployment_test.yaml index 1f7610c..b2e3356 100644 --- a/charts/icinga-stack/tests/icingadb_deployment_test.yaml +++ b/charts/icinga-stack/tests/icingadb_deployment_test.yaml @@ -1,8 +1,8 @@ -suite: "[IcingaDB] Deployment" +suite: "[Icinga DB] Deployment" templates: - ../charts/icingadb/templates/deployment.yaml tests: - - it: deploys an IcingaDB deployment + - it: deploys an Icinga DB deployment values: - required_values.yaml release: @@ -15,7 +15,7 @@ tests: path: metadata.name value: my-icinga-icingadb - - it: deploys an IcingaDB deployment using values + - it: deploys an Icinga DB deployment using values values: - required_values.yaml release: @@ -38,7 +38,7 @@ tests: name: ICINGADB_DATABASE_PASSWORD value: insecureicingadbpassword - - it: deploys an IcingaDB deployment using secrets + - it: deploys an Icinga DB deployment using secrets values: - required_values_secrets.yaml release: @@ -67,7 +67,7 @@ tests: name: database-icingadb key: password - - it: deploys an IcingaDB deployment with extra environment variables + - it: deploys an Icinga DB deployment with extra environment variables values: - required_values.yaml set: