diff --git a/common/mariadb-galera/CHANGELOG.md b/common/mariadb-galera/CHANGELOG.md index b49929e29a..c168137a8b 100644 --- a/common/mariadb-galera/CHANGELOG.md +++ b/common/mariadb-galera/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## v0.29.5 - 2024/07/30 +* labels standardized for all components + * `sharedservices.labels` renamed to `mariadb-galera.labels` to avoid [conflicts with templates from other charts](https://helm.sh/docs/chart_template_guide/subcharts_and_globals/#sharing-templates-with-subcharts) + * redundant labels removed + * label selectors updated + * unit tests added/updated +* software versions bumped + * Ubuntu packages timestamp `20240724035543` +* chart version bumped + ## v0.29.4 - 2024/07/23 * init containers to set `vm.max_map_count` and `vm.drop_caches` removed * because both settings are not required for the related components diff --git a/common/mariadb-galera/README.md b/common/mariadb-galera/README.md index 3e59c408cd..ae63be44bd 100644 --- a/common/mariadb-galera/README.md +++ b/common/mariadb-galera/README.md @@ -46,7 +46,7 @@ Docker images and Helm chart to deploy a [MariaDB](https://mariadb.com/kb/en/get ## Metadata | chart version | app version | type | url | |:--------------|:-------------|:-------------|:-------------| -| 0.29.4 | 10.5.25 | application | [Git repo](https://github.com/sapcc/helm-charts/tree/master/common/mariadb-galera) | +| 0.29.5 | 10.5.25 | application | [Git repo](https://github.com/sapcc/helm-charts/tree/master/common/mariadb-galera) | | Name | Email | Url | | ---- | ------ | --- | @@ -78,11 +78,11 @@ Kubernetes: `>=1.18` * productive version ```bash - docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240618114008 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240618114008 ./docker/mariadb-galera/ + docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240724035543 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240724035543 ./docker/mariadb-galera/ ``` * debug version ```bash - docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240618114008 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 --build-arg GALERA_DEBUG=true -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-debug:10.5.25-20240618114008 ./docker/mariadb-galera/ + docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240724035543 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 --build-arg GALERA_DEBUG=true -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-debug:10.5.25-20240724035543 ./docker/mariadb-galera/ ``` ### MySQL Exporter image @@ -91,7 +91,7 @@ Kubernetes: `>=1.18` | USERID | id of the user that should run the binary | ```bash -docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=mysqld_exporter --build-arg SOFT_VERSION=0.14.0 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3000 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-mysqld_exporter:0.14.0-20240618114008 ./docker/mysqld_exporter/ +docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=mysqld_exporter --build-arg SOFT_VERSION=0.14.0 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3000 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-mysqld_exporter:0.14.0-20240724035543 ./docker/mysqld_exporter/ ``` ### ProxySQL image @@ -100,7 +100,7 @@ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE | USERID | id of the user that should run the binary | ```bash -docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=proxysql --build-arg SOFT_VERSION=2.6.3 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3100 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-proxysql:2.6.3-20240618114008 ./docker/proxysql/ +docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=proxysql --build-arg SOFT_VERSION=2.6.3 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3100 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-proxysql:2.6.3-20240724035543 ./docker/proxysql/ ``` ### HAProxy image @@ -110,7 +110,7 @@ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE | USERID | id of the user that should run the binary | ```bash -docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=haproxy --build-arg SOFT_VERSION=2.8.10 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3100 --build-arg MARIADB_VERSION=10.5.23+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-haproxy:2.8.10-20240618114008 ./docker/haproxy/ +docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=haproxy --build-arg SOFT_VERSION=2.8.10 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3100 --build-arg MARIADB_VERSION=10.5.23+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-haproxy:2.8.10-20240724035543 ./docker/haproxy/ ``` ### Kopia image @@ -120,14 +120,14 @@ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE | USERID | id of the user that should run the binary | ```bash -docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=kopia --build-arg SOFT_VERSION=0.17.0 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3200 --build-arg MARIADB_VERSION=10.5.20+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopiabackup:0.17.0-20240618114008 ./docker/kopia/ +docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=kopia --build-arg SOFT_VERSION=0.17.0 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3200 --build-arg MARIADB_VERSION=10.5.20+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopiabackup:0.17.0-20240724035543 ./docker/kopia/ ``` ### Ubuntu image ```bash -docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg IMG_VERSION=20240618114008 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:20.04-20240618114008 ./docker/ubuntu/ -docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg IMG_VERSION=20240618114008 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 ./docker/ubuntu/ +docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg IMG_VERSION=20240724035543 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:20.04-20240724035543 ./docker/ubuntu/ +docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg IMG_VERSION=20240724035543 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 ./docker/ubuntu/ ``` ## Helm chart @@ -166,7 +166,7 @@ docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=22. ``` * [push](https://helm.sh/docs/topics/registries/#the-push-subcommand) the chart to the registry ```shell - helm push mariadb-galera-0.29.4.tgz oci://keppel.eu-de-1.cloud.sap/ccloud-helm/ + helm push mariadb-galera-0.29.5.tgz oci://keppel.eu-de-1.cloud.sap/ccloud-helm/ ``` ### values description @@ -265,48 +265,48 @@ docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=22. | hpa.proxy.maxCpuPercent | int | 66 | average CPU usage in percent across all ProxySQL cluster pods that triggers the scaling process | | hpa.proxy.maxReplicas | int | 5 | maximum number of replicas allowed for the ProxySQL cluster pods | | hpa.proxy.minReplicas | int | 3 | minimum number of replicas allowed for the ProxySQL cluster pods | -| image.database.imageversion | int | `20240618114008` | image part of the image version that should be pulled | +| image.database.imageversion | int | `20240724035543` | image part of the image version that should be pulled | | image.database.project | string | `"ccloud"` | project/tenant used in the image registry | | image.database.pullPolicy | string | IfNotPresent | `Always` to enforce that the image will be pulled even if it is already available on the worker node | | image.database.pullSecret | string | `nil` | name of the defined Kubernetes secret defined in `image.pullSecrets` that should be used for container registry authentication | | image.database.registry | string | `"keppel.eu-de-1.cloud.sap"` | hostname of the image registry used to pull the database image that contains `MariaDB`, `Galera` and the helper `yq` | | image.database.softwarename | string | `"mariadb-galera"` | folder/container used in the image registry and also part of the image name | | image.database.softwareversion | string | `"10.5.25"` | software version part of the image version that should be pulled | -| image.haproxy.imageversion | int | `20240614163411` | image part of the image version that should be pulled | +| image.haproxy.imageversion | int | `20240724035543` | image part of the image version that should be pulled | | image.haproxy.project | string | `"ccloud"` | project/tenant used in the image registry | | image.haproxy.pullPolicy | string | IfNotPresent | `Always` to enforce that the image will be pulled even if it is already available on the worker node | | image.haproxy.pullSecret | string | `nil` | name of the defined Kubernetes secret defined in `image.pullSecrets` that should be used for container registry authentication | | image.haproxy.registry | string | `"keppel.eu-de-1.cloud.sap"` | hostname of the image registry used to pull the proxy image that contains the Restic backup software | | image.haproxy.softwarename | string | `"mariadb-galera-haproxy"` | folder/container used in the image registry and also part of the image name | | image.haproxy.softwareversion | string | `"2.8.10"` | software version part of the image version that should be pulled | -| image.kopiabackup.imageversion | int | `20240618114008` | image part of the image version that should be pulled | +| image.kopiabackup.imageversion | int | `20240724035543` | image part of the image version that should be pulled | | image.kopiabackup.project | string | `"ccloud"` | project/tenant used in the image registry | | image.kopiabackup.pullPolicy | string | IfNotPresent | `Always` to enforce that the image will be pulled even if it is already available on the worker node | | image.kopiabackup.pullSecret | string | `nil` | name of the defined Kubernetes secret defined in `image.pullSecrets` that should be used for container registry authentication | | image.kopiabackup.registry | string | `"keppel.eu-de-1.cloud.sap"` | hostname of the image registry used to pull the proxy image that contains the Kopia backup software | | image.kopiabackup.softwarename | string | `"mariadb-galera-kopia"` | folder/container used in the image registry and also part of the image name | | image.kopiabackup.softwareversion | string | `"0.17.0"` | software version part of the image version that should be pulled | -| image.monitoring.imageversion | int | `20240618114008` | image part of the image version that should be pulled | +| image.monitoring.imageversion | int | `20240724035543` | image part of the image version that should be pulled | | image.monitoring.project | string | `"ccloud"` | project/tenant used in the image registry | | image.monitoring.pullPolicy | string | IfNotPresent | `Always` to enforce that the image will be pulled even if it is already available on the worker node | | image.monitoring.pullSecret | string | `nil` | name of the defined Kubernetes secret defined in `image.pullSecrets` that should be used for container registry authentication | | image.monitoring.registry | string | `"keppel.eu-de-1.cloud.sap"` | hostname of the image registry used to pull the monitoring image that currently contains the MySQL exporter for Prometheus | | image.monitoring.softwarename | string | `"mariadb-galera-mysqld_exporter"` | folder/container used in the image registry and also part of the image name | | image.monitoring.softwareversion | string | `"0.14.0"` | software version part of the image version that should be pulled | -| image.os.imageversion | int | `20240618114008` | image part of the image version that should be pulled | +| image.os.imageversion | int | `20240724035543` | image part of the image version that should be pulled | | image.os.project | string | `"ccloud"` | project/tenant used in the image registry | | image.os.pullPolicy | string | IfNotPresent | `Always` to enforce that the image will be pulled even if it is already available on the worker node | | image.os.pullSecret | string | `nil` | name of the defined Kubernetes secret defined in `image.pullSecrets` that should be used for container registry authentication | | image.os.registry | string | `"keppel.eu-de-1.cloud.sap"` | hostname of the image registry used to pull the basic OS image that will be used for certain init steps | | image.os.softwarename | string | `"mariadb-galera-ubuntu"` | folder/container used in the image registry and also part of the image name | | image.os.softwareversion | float | `22.04` | software version part of the image version that should be pulled | -| image.proxy.imageversion | int | `20240618114008` | image part of the image version that should be pulled | -| image.proxy.project | string | `"ccloud"` | project/tenant used in the image registry | -| image.proxy.pullPolicy | string | IfNotPresent | `Always` to enforce that the image will be pulled even if it is already available on the worker node | -| image.proxy.pullSecret | string | `nil` | name of the defined Kubernetes secret defined in `image.pullSecrets` that should be used for container registry authentication | -| image.proxy.registry | string | `"keppel.eu-de-1.cloud.sap"` | hostname of the image registry used to pull the proxy image that contains the ProxySQL software to load balance MariaDB connections | -| image.proxy.softwarename | string | `"mariadb-galera-proxysql"` | folder/container used in the image registry and also part of the image name | -| image.proxy.softwareversion | string | `"2.6.3"` | software version part of the image version that should be pulled | +| image.proxysql.imageversion | int | `20240724035543` | image part of the image version that should be pulled | +| image.proxysql.project | string | `"ccloud"` | project/tenant used in the image registry | +| image.proxysql.pullPolicy | string | IfNotPresent | `Always` to enforce that the image will be pulled even if it is already available on the worker node | +| image.proxysql.pullSecret | string | `nil` | name of the defined Kubernetes secret defined in `image.pullSecrets` that should be used for container registry authentication | +| image.proxysql.registry | string | `"keppel.eu-de-1.cloud.sap"` | hostname of the image registry used to pull the proxy image that contains the ProxySQL software to load balance MariaDB connections | +| image.proxysql.softwarename | string | `"mariadb-galera-proxysql"` | folder/container used in the image registry and also part of the image name | +| image.proxysql.softwareversion | string | `"2.6.3"` | software version part of the image version that should be pulled | | image.pullSecrets.secretname.credential | string | `nil` | the combined username & password string that is valid for the container registry | | image.pullSecrets.secretname.enabled | bool | `nil` | enable this [Kubernetes pull secret](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) | | image.pullSecrets.secretname.registry | string | `nil` | the hostname of the container registry that should be used for the pull secret | diff --git a/common/mariadb-galera/helm/Chart.yaml b/common/mariadb-galera/helm/Chart.yaml index 70518bf0be..fb20b681af 100644 --- a/common/mariadb-galera/helm/Chart.yaml +++ b/common/mariadb-galera/helm/Chart.yaml @@ -3,7 +3,7 @@ name: mariadb-galera description: Docker images and Helm chart to deploy a [MariaDB](https://mariadb.com/kb/en/getting-installing-and-upgrading-mariadb/) HA cluster based on [Galera](https://mariadb.com/kb/en/what-is-mariadb-galera-cluster/) home: "https://github.com/sapcc/helm-charts/tree/master/common/mariadb-galera" appVersion: 10.5.25 -version: 0.29.4 +version: 0.29.5 type: application kubeVersion: ">=1.18" maintainers: diff --git a/common/mariadb-galera/helm/README.md.gotmpl b/common/mariadb-galera/helm/README.md.gotmpl index 55ef286723..5e1e91386a 100644 --- a/common/mariadb-galera/helm/README.md.gotmpl +++ b/common/mariadb-galera/helm/README.md.gotmpl @@ -72,11 +72,11 @@ The [changelog](CHANGELOG.md) contains information about changes in certain vers * productive version ```bash - docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240618114008 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240618114008 ./docker/mariadb-galera/ + docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240724035543 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240724035543 ./docker/mariadb-galera/ ``` * debug version ```bash - docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240618114008 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 --build-arg GALERA_DEBUG=true -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-debug:10.5.25-20240618114008 ./docker/mariadb-galera/ + docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=mariadb --build-arg SOFT_VERSION=10.5.25+maria~ubu2004 --build-arg IMG_VERSION=20240724035543 --build-arg GALERA_VERSION=26.4.18-ubu2004 --build-arg YQ_VERSION=4.44.1 --build-arg GALERA_DEBUG=true -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-debug:10.5.25-20240724035543 ./docker/mariadb-galera/ ``` ### MySQL Exporter image @@ -85,7 +85,7 @@ The [changelog](CHANGELOG.md) contains information about changes in certain vers | USERID | id of the user that should run the binary | ```bash -docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=mysqld_exporter --build-arg SOFT_VERSION=0.14.0 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3000 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-mysqld_exporter:0.14.0-20240618114008 ./docker/mysqld_exporter/ +docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=mysqld_exporter --build-arg SOFT_VERSION=0.14.0 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3000 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-mysqld_exporter:0.14.0-20240724035543 ./docker/mysqld_exporter/ ``` ### ProxySQL image @@ -94,7 +94,7 @@ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE | USERID | id of the user that should run the binary | ```bash -docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=proxysql --build-arg SOFT_VERSION=2.6.3 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3100 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-proxysql:2.6.3-20240618114008 ./docker/proxysql/ +docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera-ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=proxysql --build-arg SOFT_VERSION=2.6.3 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3100 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-proxysql:2.6.3-20240724035543 ./docker/proxysql/ ``` ### HAProxy image @@ -104,7 +104,7 @@ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE | USERID | id of the user that should run the binary | ```bash -docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=haproxy --build-arg SOFT_VERSION=2.8.10 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3100 --build-arg MARIADB_VERSION=10.5.23+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-haproxy:2.8.10-20240618114008 ./docker/haproxy/ +docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=haproxy --build-arg SOFT_VERSION=2.8.10 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3100 --build-arg MARIADB_VERSION=10.5.23+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-haproxy:2.8.10-20240724035543 ./docker/haproxy/ ``` ### Kopia image @@ -114,14 +114,14 @@ docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE | USERID | id of the user that should run the binary | ```bash -docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240618114008 --build-arg SOFT_NAME=kopia --build-arg SOFT_VERSION=0.17.0 --build-arg IMG_VERSION=20240618114008 --build-arg USERID=3200 --build-arg MARIADB_VERSION=10.5.20+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopiabackup:0.17.0-20240618114008 ./docker/kopia/ +docker build --build-arg BASE_REGISTRY=keppel.eu-de-1.cloud.sap --build-arg BASE_ACCOUNT=ccloud --build-arg BASE_SOFT_NAME=mariadb-galera --build-arg BASE_SOFT_VERSION=10.5.25 --build-arg BASE_IMG_VERSION=20240724035543 --build-arg SOFT_NAME=kopia --build-arg SOFT_VERSION=0.17.0 --build-arg IMG_VERSION=20240724035543 --build-arg USERID=3200 --build-arg MARIADB_VERSION=10.5.20+maria~ubu2004 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopiabackup:0.17.0-20240724035543 ./docker/kopia/ ``` ### Ubuntu image ```bash -docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg IMG_VERSION=20240618114008 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:20.04-20240618114008 ./docker/ubuntu/ -docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg IMG_VERSION=20240618114008 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 ./docker/ubuntu/ +docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=20.04 --build-arg IMG_VERSION=20240724035543 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:20.04-20240724035543 ./docker/ubuntu/ +docker build --build-arg BASE_SOFT_NAME=ubuntu --build-arg BASE_SOFT_VERSION=22.04 --build-arg IMG_VERSION=20240724035543 -t keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 ./docker/ubuntu/ ``` ## Helm chart diff --git a/common/mariadb-galera/helm/templates/_helpers.tpl b/common/mariadb-galera/helm/templates/_helpers.tpl index a699639a81..a2419ba8a4 100644 --- a/common/mariadb-galera/helm/templates/_helpers.tpl +++ b/common/mariadb-galera/helm/templates/_helpers.tpl @@ -45,8 +45,15 @@ metadata: loadbalancer.openstack.org/enable-health-monitor: "false" {{- end }} labels: - app: {{ .global.Release.Name }} - {{- include "sharedservices.labels" .global | indent 4 }} + {{- if or (eq .component "database") (eq .component "database-direct") }} + {{- include "mariadb-galera.labels" (list .global "version" "database" "svc" "database") | indent 4 }} + {{- else if eq .component "kopiaserver"}} + {{- include "mariadb-galera.labels" (list .global "version" "kopiabackup" "svc" "server") | indent 4 }} + {{- else if eq .component "proxysql"}} + {{- include "mariadb-galera.labels" (list .global "version" "proxysql" "svc" "proxy") | indent 4 }} + {{- else if eq .component "haproxy"}} + {{- include "mariadb-galera.labels" (list .global "version" "haproxy" "svc" "proxy") | indent 4 }} + {{- end }} spec: {{- if and (.service.headless) (ne .service.type "LoadBalancer") (eq .replica "notused") }} type: {{ required "the network service type has to be defined" .service.type }} @@ -64,17 +71,21 @@ spec: {{- if ne .replica "notused" }} statefulset.kubernetes.io/pod-name: {{ (printf "%s-%s" $nodeNamePrefix .replica) }} {{- else if and (hasKey .global.Values.mariadb "autostart") (not .global.Values.mariadb.autostart) }} - component: "disabledBecauseOf-mariadb.autostart-disabled" + app.kubernetes.io/component: "disabledBecauseOf-mariadb.autostart-disabled" {{- else if and (.global.Values.command) (hasKey .global.Values.command "database") }} - component: "disabledBecauseOf-command.database-defined" + app.kubernetes.io/component: "disabledBecauseOf-command.database-defined" {{- else if and (hasKey .global.Values.mariadb "wipeDataAndLog") (.global.Values.mariadb.wipeDataAndLog) }} - component: "disabledBecauseOf-mariadb.wipeDataAndLog-enabled" + app.kubernetes.io/component: "disabledBecauseOf-mariadb.wipeDataAndLog-enabled" {{- else if and (hasKey .global.Values.mariadb.galera.restore "kopia") (.global.Values.mariadb.galera.restore.kopia.enabled) }} - component: "disabledBecauseOf-mariadb.galera.restore-enabled" - {{- else if eq .component "database-direct" }} - component: "database" - {{- else }} - component: {{ .component | quote }} + app.kubernetes.io/component: "disabledBecauseOf-mariadb.galera.restore-enabled" + {{- else if or (eq .component "database") (eq .component "database-direct") }} + app.kubernetes.io/component: {{ (index .global.Values.image (printf "%s" "database")).softwarename }}-sts-database + {{- else if eq .component "kopiaserver" }} + app.kubernetes.io/component: {{ (index .global.Values.image (printf "%s" "kopiabackup")).softwarename }}-deploy-server + {{- else if eq .component "proxysql"}} + app.kubernetes.io/component: {{ (index .global.Values.image (printf "%s" "proxysql")).softwarename }}-sts-proxy + {{- else if eq .component "haproxy"}} + app.kubernetes.io/component: {{ (index .global.Values.image (printf "%s" "haproxy")).softwarename }}-deploy-proxy {{- end }} ports: {{- range $portKey, $portValue := .service.ports }} @@ -247,7 +258,7 @@ spec: {{/* Generate Kubernetes basic-auth secrets - include "generateSecretTypeOpaque" (dict "global" .global "name" $.name "credential" $.credential "suffix" $.suffix) + include "generateSecretTypeBasicAuth" (dict "global" .global "name" $.name "credential" $.credential "suffix" $.suffix) */}} {{- define "generateSecretTypeBasicAuth" }} --- @@ -258,7 +269,7 @@ metadata: namespace: {{ $.global.Release.Namespace }} name: {{ include "commonPrefix" .global }}-{{ $.suffix }}-{{ $.name }} labels: - {{- include "sharedservices.labels" .global | indent 4 }} + {{- include "mariadb-galera.labels" (list .global "version" "database" "secret" "basic") | indent 4 }} data: username: {{ (required (printf "%s.users.%s.username is required to configure the Kubernetes secret for the '%s' user" $.suffix $.name $.name) $.credential.username) | b64enc }} password: {{ (required (printf "%s.users.%s.password is required to configure the Kubernetes secret for the '%s' user" $.suffix $.name $.name) $.credential.password) | b64enc }} @@ -276,6 +287,8 @@ type: Opaque metadata: namespace: {{ $.global.Release.Namespace }} name: {{ include "commonPrefix" .global }}-{{ $.suffix }}-{{ $.name }} + labels: + {{- include "mariadb-galera.labels" (list .global "version" "database" "secret" "opaque") | indent 4 }} data: password: {{ (required (printf "%s.users.%s.password is required to configure the Kubernetes secret for the '%s' user" $.suffix $.name $.name) $.credential.password) | b64enc }} {{- end }} @@ -292,6 +305,8 @@ type: kubernetes.io/dockerconfigjson metadata: namespace: {{ $.global.Release.Namespace }} name: {{ include "commonPrefix" .global }}-pullsecret-{{ $.name }} + labels: + {{- include "mariadb-galera.labels" (list .global "version" "database" "secret" "dockerconfigjson") | indent 4 }} data: .dockerconfigjson: {{ printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" (required (printf "image.pullSecrets.%s.registry is required to configure the Kubernetes pull secret '%s'" $.name $.name) $.credential.registry) (printf "%s" (required (printf "image.pullSecrets.%s.credential is required to configure the Kubernetes pull secret '%s'" $.name $.name) $.credential.credential) | b64enc) | b64enc }} {{- end }} @@ -308,12 +323,29 @@ data: {{- end }} {{- end }} -{{- define "sharedservices.labels" }} +{{/* + Generate labels + $ = global values + version/noversion = enable/disable version fields in labels + database = desired component name + job = object type + config = provided function + include "mariadb-galera.labels" (list $ "version" "database" "sts" "database") + include "mariadb-galera.labels" (list $ "version" "database" "job" "config") +*/}} +{{- define "mariadb-galera.labels" }} +{{- $ := index . 0 }} +{{- $component := index . 2 }} +{{- $type := index . 3 }} +{{- $function := index . 4 }} app.kubernetes.io/name: {{ $.Chart.Name }} app.kubernetes.io/instance: {{ $.Chart.Name }}-{{ $.Release.Name }} -app.kubernetes.io/version: {{ $.Chart.Version }} -app.kubernetes.io/component: MariaDB-Galera +app.kubernetes.io/component: {{ (index $.Values.image (printf "%s" $component)).softwarename }}-{{ $type }}-{{ $function }} app.kubernetes.io/part-of: {{ $.Release.Name }} + {{- if eq (index . 1) "version" }} +app.kubernetes.io/version: {{ (index $.Values.image (printf "%s" $component)).softwareversion }}-{{ (index $.Values.image (printf "%s" $component)).imageversion | int }} +helm.sh/chart: {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }} + {{- end }} {{- end }} {{- define "storageclassCinder" }} @@ -323,7 +355,7 @@ kind: StorageClass metadata: name: {{ include "commonPrefix" $ }}-cinder labels: - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "version" "database" "sc" "block") | indent 4 }} parameters: type: vmware provisioner: cinder.csi.openstack.org @@ -339,7 +371,7 @@ kind: StorageClass metadata: name: {{ include "commonPrefix" $ }}-nfs labels: - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "version" "database" "sc" "file") | indent 4 }} parameters: pathPattern: "${.PVC.namespace}-${.PVC.name}" onDelete: "delete" diff --git a/common/mariadb-galera/helm/templates/alerts.yaml b/common/mariadb-galera/helm/templates/alerts.yaml index 8f4d785b37..4df576339b 100644 --- a/common/mariadb-galera/helm/templates/alerts.yaml +++ b/common/mariadb-galera/helm/templates/alerts.yaml @@ -12,13 +12,8 @@ metadata: name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "database")) }}-alerts namespace: {{ $.Release.Namespace }} labels: - app: {{ $.Release.Name }} - component: "database" - release: {{ $.Release.Name }} - chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}" - heritage: "{{ $.Release.Service }}" prometheus: {{ $.Values.monitoring.prometheus.instance.database | default "prometheus" | quote }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "database" "crd" "promrule") | indent 4 }} spec: groups: {{ include (print .Template.BasePath "/alerts/_mariadb.tpl") . | indent 2 }} @@ -35,13 +30,8 @@ metadata: name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "proxysql")) }}-alerts namespace: {{ $.Release.Namespace }} labels: - app: {{ $.Release.Name }} - component: "proxysql" - release: {{ $.Release.Name }} - chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}" - heritage: "{{ $.Release.Service }}" prometheus: {{ $.Values.monitoring.prometheus.instance.database | default "prometheus" | quote }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "proxysql" "crd" "promrule") | indent 4 }} spec: groups: {{ include (print .Template.BasePath "/alerts/_proxysql.tpl") . | indent 2 }} @@ -58,13 +48,8 @@ metadata: name: {{ include "commonPrefix" $ }}-backup-kopiaserver-alerts namespace: {{ $.Release.Namespace }} labels: - app: {{ $.Release.Name }} - component: "kopiaserver" - release: {{ $.Release.Name }} - chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}" - heritage: "{{ $.Release.Service }}" prometheus: {{ $.Values.monitoring.prometheus.instance.database | default "prometheus" | quote }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "version" "kopiabackup" "crd" "promrule") | indent 4 }} spec: groups: {{ include (print .Template.BasePath "/alerts/_kopia.tpl") . | indent 2 }} @@ -81,13 +66,8 @@ metadata: name: {{ include "commonPrefix" $ }}-kubernetes-alerts namespace: {{ $.Release.Namespace }} labels: - app: {{ $.Release.Name }} - component: "kubernetes" - release: {{ $.Release.Name }} - chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}" - heritage: "{{ $.Release.Service }}" prometheus: {{ $.Values.monitoring.prometheus.instance.kubernetes | default "prometheus" | quote }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "version" "database" "crd" "promrule") | indent 4 }} spec: groups: {{ include (print .Template.BasePath "/alerts/_kubernetes.tpl") . | indent 2 }} diff --git a/common/mariadb-galera/helm/templates/configmap-haproxy.yaml b/common/mariadb-galera/helm/templates/configmap-haproxy.yaml index fc61470e06..67f7c47001 100644 --- a/common/mariadb-galera/helm/templates/configmap-haproxy.yaml +++ b/common/mariadb-galera/helm/templates/configmap-haproxy.yaml @@ -6,8 +6,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-haproxy-config labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "haproxy" "cm" "config") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/haproxy/haproxy.cfg").AsConfig . | indent 2 }} --- @@ -17,8 +16,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-haproxy-probes-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "haproxy" "cm" "probes") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/haproxy/startup.sh").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "scripts/haproxy/liveness.sh").AsConfig . | indent 2 }} diff --git a/common/mariadb-galera/helm/templates/configmap-kopia.yaml b/common/mariadb-galera/helm/templates/configmap-kopia.yaml index d557d4efc2..22b2f138ba 100644 --- a/common/mariadb-galera/helm/templates/configmap-kopia.yaml +++ b/common/mariadb-galera/helm/templates/configmap-kopia.yaml @@ -8,8 +8,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-kopia-common-functions-extended-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "kopiabackup" "cm" "functions") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/backup/common-functions-extended.sh").AsConfig . | indent 2 }} --- @@ -19,8 +18,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-kopia-job-entrypoint-restore-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "kopiabackup" "cm" "restore") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/backup/kopia/entrypoint-job-restore.sh").AsConfig . | indent 2 }} --- @@ -30,8 +28,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-kopia-entrypoint-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "kopiabackup" "cm" "entrypoint") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/backup/kopia/entrypoint-backup.sh").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "scripts/backup/kopia/entrypoint-restore.sh").AsConfig . | indent 2 }} @@ -42,6 +39,8 @@ kind: ConfigMap metadata: name: {{ include "commonPrefix" $ }}-kopia-probes-sh namespace: {{ $.Release.Namespace }} + labels: + {{- include "mariadb-galera.labels" (list $ "noversion" "kopiabackup" "cm" "probes") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/backup/kopia/startup.sh").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "scripts/backup/kopia/liveness.sh").AsConfig . | indent 2 }} diff --git a/common/mariadb-galera/helm/templates/configmap-mariadb-job.yaml b/common/mariadb-galera/helm/templates/configmap-mariadb-job.yaml index 7b1cf4a4a2..1405f742db 100644 --- a/common/mariadb-galera/helm/templates/configmap-mariadb-job.yaml +++ b/common/mariadb-galera/helm/templates/configmap-mariadb-job.yaml @@ -10,8 +10,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-mariadb-config-job-entrypoint-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "database" "cm" "entrypoint") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/mariadb-galera/entrypoint-job-config.sh").AsConfig . | indent 2 }} {{- end }} \ No newline at end of file diff --git a/common/mariadb-galera/helm/templates/configmap-mariadb-my.cnf.yaml b/common/mariadb-galera/helm/templates/configmap-mariadb-my.cnf.yaml index 42f7ec9fa1..fa6e7dbbac 100644 --- a/common/mariadb-galera/helm/templates/configmap-mariadb-my.cnf.yaml +++ b/common/mariadb-galera/helm/templates/configmap-mariadb-my.cnf.yaml @@ -58,7 +58,7 @@ metadata: name: {{ include "commonPrefix" $ }}-mariadb-my-cnf namespace: {{ $.Release.Namespace }} labels: - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "database" "cm" "config") | indent 4 }} data: {{- range $int, $err := until ((include "replicaCount" (dict "global" $ "type" "database")) | int) }} my.cnf.{{ $nodeNamePrefix }}-{{ $int }}.tpl: |- diff --git a/common/mariadb-galera/helm/templates/configmap-mariadb.yaml b/common/mariadb-galera/helm/templates/configmap-mariadb.yaml index b1f5a14f9a..75c9761dcb 100644 --- a/common/mariadb-galera/helm/templates/configmap-mariadb.yaml +++ b/common/mariadb-galera/helm/templates/configmap-mariadb.yaml @@ -5,8 +5,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-mariadb-entrypoint-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "database" "cm" "entrypoint") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/mariadb-galera/entrypoint-galera.sh").AsConfig . | indent 2 }} --- @@ -16,8 +15,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-mariadb-common-functions-extended-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "database" "cm" "functions") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/mariadb-galera/common-functions-extended.sh").AsConfig . | indent 2 }} --- @@ -26,6 +24,8 @@ kind: ConfigMap metadata: name: {{ include "commonPrefix" $ }}-mariadb-probes-sh namespace: {{ $.Release.Namespace }} + labels: + {{- include "mariadb-galera.labels" (list $ "noversion" "database" "cm" "probes") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/mariadb-galera/startup.sh").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "scripts/mariadb-galera/liveness.sh").AsConfig . | indent 2 }} @@ -37,8 +37,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-mariadb-hooks-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "database" "cm" "hooks") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/mariadb-galera/pre-stop-hook.sh").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "scripts/mariadb-galera/post-start-hook.sh").AsConfig . | indent 2 }} @@ -48,6 +47,8 @@ kind: ConfigMap metadata: name: {{ include "commonPrefix" $ }}-galerastatus namespace: {{ $.Release.Namespace }} + labels: + {{- include "mariadb-galera.labels" (list $ "noversion" "database" "cm" "status") | indent 4 }} data: {{- range $int, $err := until ((include "replicaCount" (dict "global" $ "type" "database")) | int) }} {{ (include "nodeNamePrefix" (dict "global" $ "component" "database")) }}-{{ $int }}.seqno: |- @@ -60,6 +61,8 @@ kind: ConfigMap metadata: name: {{ include "commonPrefix" $ }}-mariadb-wipedata namespace: {{ $.Release.Namespace }} + labels: + {{- include "mariadb-galera.labels" (list $ "noversion" "database" "cm" "wipedata") | indent 4 }} data: wipedata.flag: |- true diff --git a/common/mariadb-galera/helm/templates/configmap-mysqld_exporter.yaml b/common/mariadb-galera/helm/templates/configmap-mysqld_exporter.yaml index f4595c9b8f..4b90388367 100644 --- a/common/mariadb-galera/helm/templates/configmap-mysqld_exporter.yaml +++ b/common/mariadb-galera/helm/templates/configmap-mysqld_exporter.yaml @@ -10,8 +10,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-monitoring-entrypoint-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "monitoring" "cm" "entrypoint") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/mysqld_exporter/entrypoint.sh").AsConfig . | indent 2 }} --- @@ -20,6 +19,8 @@ kind: ConfigMap metadata: name: {{ include "commonPrefix" $ }}-monitoring-probes-sh namespace: {{ $.Release.Namespace }} + labels: + {{- include "mariadb-galera.labels" (list $ "noversion" "monitoring" "cm" "probes") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/mysqld_exporter/liveness.sh").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "scripts/mysqld_exporter/readiness.sh").AsConfig . | indent 2 }} @@ -30,8 +31,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-monitoring-common-functions-extended-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "monitoring" "cm" "functions") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/mysqld_exporter/common-functions-extended.sh").AsConfig . | indent 2 }} {{- end }} diff --git a/common/mariadb-galera/helm/templates/configmap-proxysql.conf.yaml b/common/mariadb-galera/helm/templates/configmap-proxysql.conf.yaml index 7105fa3b74..d29af2ab9a 100644 --- a/common/mariadb-galera/helm/templates/configmap-proxysql.conf.yaml +++ b/common/mariadb-galera/helm/templates/configmap-proxysql.conf.yaml @@ -55,7 +55,7 @@ metadata: name: {{ include "commonPrefix" $ }}-proxysql-conf namespace: {{ $.Release.Namespace }} labels: - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "proxysql" "cm" "config") | indent 4 }} data: proxysql_servers.cfg.tpl: |- {{- range $int, $err := until ((include "replicaCount" (dict "global" $ "type" "proxy")) | int) }} diff --git a/common/mariadb-galera/helm/templates/configmap-proxysql.yaml b/common/mariadb-galera/helm/templates/configmap-proxysql.yaml index 2dda7cca29..3826dbf6b5 100644 --- a/common/mariadb-galera/helm/templates/configmap-proxysql.yaml +++ b/common/mariadb-galera/helm/templates/configmap-proxysql.yaml @@ -6,8 +6,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-proxysql-entrypoint-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "proxysql" "cm" "entrypoint") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/proxysql/entrypoint.sh").AsConfig . | indent 2 }} --- @@ -17,8 +16,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-proxysql-common-functions-extended-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "proxysql" "cm" "functions") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/proxysql/common-functions-extended.sh").AsConfig . | indent 2 }} --- @@ -28,8 +26,7 @@ metadata: name: {{ include "commonPrefix" $ }}-proxysql-probes-sh namespace: {{ $.Release.Namespace }} labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "proxysql" "cm" "probes") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/proxysql/startup.sh").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "scripts/proxysql/liveness.sh").AsConfig . | indent 2 }} @@ -41,8 +38,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-proxysql-hooks-sh labels: - app: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "noversion" "proxysql" "cm" "hooks") | indent 4 }} data: {{ tpl (.Files.Glob "scripts/proxysql/pre-stop-hook.sh").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "scripts/proxysql/post-start-hook.sh").AsConfig . | indent 2 }} diff --git a/common/mariadb-galera/helm/templates/cronjob-kopia-backup.yaml b/common/mariadb-galera/helm/templates/cronjob-kopia-backup.yaml index 46ff45580c..e32f8ed9a9 100644 --- a/common/mariadb-galera/helm/templates/cronjob-kopia-backup.yaml +++ b/common/mariadb-galera/helm/templates/cronjob-kopia-backup.yaml @@ -10,11 +10,6 @@ kind: CronJob metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-backup-kopia-{{ $scheduleKey }}-{{ randAlphaNum 8 | lower }} - labels: - app: {{ $.Release.Name }} - release: {{ $.Release.Name }} - backupsoftware: kopia - {{- include "sharedservices.labels" $ | indent 4 }} spec: {{- if eq $scheduleKey "full" }} schedule: {{ $scheduleValue | default "15 2 * * *" | quote }} @@ -30,9 +25,8 @@ spec: template: metadata: labels: - app: {{ $.Release.Name }} - release: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 10 }} + backupsoftware: kopia + {{- include "mariadb-galera.labels" (list $ "version" "kopiabackup" "cj" "backup") | indent 12 }} annotations: {{- if or (and (hasKey $.Values "global") (and (hasKey $.Values.global "linkerd_enabled") $.Values.global.linkerd_enabled) (and (hasKey $.Values.global "linkerd_requested") $.Values.global.linkerd_requested)) $.Values.mariadb.galera.backup.kopia.linkerd.enabled }} linkerd.io/inject: enabled diff --git a/common/mariadb-galera/helm/templates/deployment-haproxy.yaml b/common/mariadb-galera/helm/templates/deployment-haproxy.yaml index f956369e66..f7826f86f8 100644 --- a/common/mariadb-galera/helm/templates/deployment-haproxy.yaml +++ b/common/mariadb-galera/helm/templates/deployment-haproxy.yaml @@ -9,23 +9,15 @@ kind: Deployment metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-haproxy - labels: - app: {{ $.Release.Name }} - component: "haproxy" - release: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} spec: replicas: {{ $.Values.replicas.proxy | default 3 }} selector: matchLabels: - component: "haproxy" + app.kubernetes.io/component: {{ (index $.Values.image (printf "%s" "haproxy")).softwarename }}-deploy-proxy template: metadata: labels: - app: {{ $.Release.Name }} - component: "haproxy" - release: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 8 }} + {{- include "mariadb-galera.labels" (list $ "version" "haproxy" "deploy" "proxy") | indent 8 }} annotations: {{- if $.Values.monitoring.proxy.enabled }} prometheus.io/scrape: "true" @@ -44,34 +36,34 @@ spec: podAffinityTerm: labelSelector: matchExpressions: - - key: "app" + - key: "app.kubernetes.io/part-of" operator: In values: - {{ $.Release.Name | quote }} - - key: "component" + - key: "app.kubernetes.io/component" operator: In values: - - "haproxy" + - {{ (index $.Values.image (printf "%s" "haproxy")).softwarename }}-deploy-proxy topologyKey: "topology.kubernetes.io/zone" - weight: 2 podAffinityTerm: labelSelector: matchExpressions: - - key: "app" + - key: "app.kubernetes.io/part-of" operator: In values: - {{ $.Release.Name | quote }} - - key: "component" + - key: "app.kubernetes.io/component" operator: In values: - - "haproxy" + - {{ (index $.Values.image (printf "%s" "haproxy")).softwarename }}-deploy-proxy topologyKey: "kubernetes.io/hostname" serviceAccount: {{ include "commonPrefix" $ }}-mariadb-galera securityContext: runAsUser: {{ $.Values.userId.proxy | default 3100 | int }} runAsGroup: {{ $.Values.groupId.proxy | default 3100 | int }} fsGroup: {{ $.Values.groupId.proxy | default 3100 | int }} - {{- if and (hasKey $.Values.image.proxy "pullSecret") $.Values.image.haproxy.pullSecret }} + {{- if and (hasKey $.Values.image.haproxy "pullSecret") $.Values.image.haproxy.pullSecret }} imagePullSecrets: - name: {{ include "commonPrefix" $ }}-{{$.Values.image.haproxy.pullSecret}} {{- end }} diff --git a/common/mariadb-galera/helm/templates/deployment-kopia-server.yaml b/common/mariadb-galera/helm/templates/deployment-kopia-server.yaml index 98706c22b9..e8a2f093e8 100644 --- a/common/mariadb-galera/helm/templates/deployment-kopia-server.yaml +++ b/common/mariadb-galera/helm/templates/deployment-kopia-server.yaml @@ -6,28 +6,20 @@ kind: Deployment metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-backup-kopiaserver - labels: - app: {{ $.Release.Name }} - release: {{ $.Release.Name }} - component: "kopiaserver" - backupsoftware: "kopia" - {{- include "sharedservices.labels" $ | indent 4 }} spec: replicas: 1 selector: matchLabels: - app: {{ $.Release.Name }} + app.kubernetes.io/component: {{ (index $.Values.image (printf "%s" "kopiabackup")).softwarename }}-deploy-server revisionHistoryLimit: {{ $.Values.revisionHistoryLimit | default 10 | int }} strategy: type: {{ $.Values.updateStrategy | default "RollingUpdate" | quote }} template: metadata: labels: - app: {{ $.Release.Name }} - release: {{ $.Release.Name }} - component: "kopiaserver" backupsoftware: "kopia" - {{- include "sharedservices.labels" $ | indent 8 }} + backupcomponent: "server" + {{- include "mariadb-galera.labels" (list $ "version" "kopiabackup" "deploy" "server") | indent 8 }} annotations: {{- if $.Values.monitoring.kopia.enabled }} prometheus.io/scrape: "true" diff --git a/common/mariadb-galera/helm/templates/hpa.yaml b/common/mariadb-galera/helm/templates/hpa.yaml index 76762853bf..f251ccbedb 100644 --- a/common/mariadb-galera/helm/templates/hpa.yaml +++ b/common/mariadb-galera/helm/templates/hpa.yaml @@ -7,7 +7,7 @@ metadata: name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "database")) }} namespace: {{ $.Release.Namespace }} labels: - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "version" "database" "hpa" "database") | indent 4 }} spec: scaleTargetRef: apiVersion: apps/v1 @@ -24,12 +24,14 @@ kind: HorizontalPodAutoscaler metadata: {{- if eq $.Values.proxy.type "proxysql" }} name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "proxysql")) }} + labels: + {{- include "mariadb-galera.labels" (list $ "version" "proxysql" "hpa" "proxy") | indent 4 }} {{- else if eq $.Values.proxy.type "haproxy" }} name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "haproxy")) }} + labels: + {{- include "mariadb-galera.labels" (list $ "version" "haproxy" "hpa" "proxy") | indent 4 }} {{- end }} namespace: {{ $.Release.Namespace }} - labels: - {{- include "sharedservices.labels" $ | indent 4 }} spec: scaleTargetRef: apiVersion: apps/v1 diff --git a/common/mariadb-galera/helm/templates/job-kopia-restore.yaml b/common/mariadb-galera/helm/templates/job-kopia-restore.yaml index 9bf3a2040f..9ffdc9dede 100644 --- a/common/mariadb-galera/helm/templates/job-kopia-restore.yaml +++ b/common/mariadb-galera/helm/templates/job-kopia-restore.yaml @@ -7,11 +7,6 @@ kind: Job metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-restore-kopia-{{ randAlphaNum 8 | lower }} - labels: - app: {{ $.Release.Name }} - release: {{ $.Release.Name }} - backupsoftware: kopia - {{- include "sharedservices.labels" $ | indent 4 }} spec: backoffLimit: {{ $.Values.mariadb.galera.restore.kopia.job.backoffLimit | default 0 | int }} activeDeadlineSeconds: {{ $.Values.mariadb.galera.restore.kopia.job.activeDeadlineSeconds | default 3600 | int }} @@ -19,9 +14,8 @@ spec: template: metadata: labels: - app: {{ $.Release.Name }} - release: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 8 }} + backupsoftware: kopia + {{- include "mariadb-galera.labels" (list $ "version" "kopiabackup" "job" "restore") | indent 8 }} annotations: {{- if or (and (hasKey $.Values "global") (and (hasKey $.Values.global "linkerd_enabled") $.Values.global.linkerd_enabled) (and (hasKey $.Values.global "linkerd_requested") $.Values.global.linkerd_requested)) $.Values.mariadb.galera.restore.kopia.linkerd.enabled }} linkerd.io/inject: enabled diff --git a/common/mariadb-galera/helm/templates/job-mariadb-config.yaml b/common/mariadb-galera/helm/templates/job-mariadb-config.yaml index fe98c98025..0925128b01 100644 --- a/common/mariadb-galera/helm/templates/job-mariadb-config.yaml +++ b/common/mariadb-galera/helm/templates/job-mariadb-config.yaml @@ -9,10 +9,6 @@ kind: Job metadata: namespace: {{ $.Release.Namespace }} name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "database")) }}-cfg-{{ randAlphaNum 8 | lower }} - labels: - app: {{ $.Release.Name }} - release: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} spec: backoffLimit: {{ $.Values.mariadb.job.config.backoffLimit | default 6 | int }} activeDeadlineSeconds: {{ $.Values.mariadb.job.config.activeDeadlineSeconds | default 300 | int }} @@ -20,9 +16,7 @@ spec: template: metadata: labels: - app: {{ $.Release.Name }} - release: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 8 }} + {{- include "mariadb-galera.labels" (list $ "version" "database" "job" "config") | indent 8 }} annotations: {{- if or (and (hasKey $.Values "global") (and (hasKey $.Values.global "linkerd_enabled") $.Values.global.linkerd_enabled) (and (hasKey $.Values.global "linkerd_requested") $.Values.global.linkerd_requested)) $.Values.mariadb.job.linkerd.enabled }} linkerd.io/inject: enabled diff --git a/common/mariadb-galera/helm/templates/persistentvolumeclaim.yaml b/common/mariadb-galera/helm/templates/persistentvolumeclaim.yaml index 94b7d0c9b8..b811222d84 100644 --- a/common/mariadb-galera/helm/templates/persistentvolumeclaim.yaml +++ b/common/mariadb-galera/helm/templates/persistentvolumeclaim.yaml @@ -9,8 +9,6 @@ apiVersion: v1 metadata: name: {{ include "commonPrefix" $ }}-{{ $volumeMountsKey }}-{{ $volumeMountsValue.claimName | lower }} namespace: {{ $.Release.Namespace }} - labels: - {{- include "sharedservices.labels" $ | indent 4 }} spec: accessModes: {{ $volumeClaimTemplatesValue.accessModes }} resources: diff --git a/common/mariadb-galera/helm/templates/poddisruptionbudget.yaml b/common/mariadb-galera/helm/templates/poddisruptionbudget.yaml index 0426cb7ecd..af209668bd 100644 --- a/common/mariadb-galera/helm/templates/poddisruptionbudget.yaml +++ b/common/mariadb-galera/helm/templates/poddisruptionbudget.yaml @@ -5,12 +5,12 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-database labels: - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "version" "database" "pdb" "database") | indent 4 }} spec: maxUnavailable: {{ $.Values.maxUnavailable.database | default 1 }} selector: matchLabels: - component: "database" + app.kubernetes.io/component: {{ (index $.Values.image (printf "%s" "database")).softwarename }}-pdb-database {{- if and (hasKey $.Values.mariadb "autostart") (not $.Values.mariadb.autostart) }} {{- else if and ($.Values.command) (hasKey $.Values.command "database") }} {{- else if and (hasKey $.Values.mariadb.galera.restore "kopia") ($.Values.mariadb.galera.restore.kopia.enabled) }} @@ -26,12 +26,28 @@ apiVersion: policy/v1 kind: PodDisruptionBudget metadata: namespace: {{ $.Release.Namespace }} - name: {{ include "commonPrefix" $ }}-proxy + name: {{ include "commonPrefix" $ }}-proxysql + labels: + {{- include "mariadb-galera.labels" (list $ "version" "proxysql" "pdb" "proxy") | indent 4 }} +spec: + maxUnavailable: {{ $.Values.maxUnavailable.proxy | default 1 }} + selector: + matchLabels: + app.kubernetes.io/component: {{ (index $.Values.image (printf "%s" "proxysql")).softwarename}}-pdb-proxy +{{- else if and ($.Values.proxy.enabled) (eq $.Values.proxy.type "haproxy") }} +--- +apiVersion: policy/v1 +kind: PodDisruptionBudget +metadata: + namespace: {{ $.Release.Namespace }} + name: {{ include "commonPrefix" $ }}-haproxy + labels: + {{- include "mariadb-galera.labels" (list $ "version" "haproxy" "pdb" "proxy") | indent 4 }} spec: maxUnavailable: {{ $.Values.maxUnavailable.proxy | default 1 }} selector: matchLabels: - component: "proxy" + app.kubernetes.io/component: {{ (index $.Values.image (printf "%s" "haproxy")).softwarename }}-pdb-proxy {{- end }} {{- if and (hasKey $.Values.mariadb "autostart") (not $.Values.mariadb.autostart) }} {{- else if and ($.Values.command) (hasKey $.Values.command "database") }} @@ -42,9 +58,11 @@ kind: PodDisruptionBudget metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-backup-kopiaserver + labels: + {{- include "mariadb-galera.labels" (list $ "version" "kopiabackup" "pdb" "server") | indent 4 }} spec: maxUnavailable: {{ $.Values.maxUnavailable.kopiaserver | default 1 }} selector: matchLabels: - component: "kopiaserver" + app.kubernetes.io/component: {{ (index $.Values.image (printf "%s" "kopiabackup")).softwarename }}-pdb-server {{- end }} diff --git a/common/mariadb-galera/helm/templates/rolebindings.yaml b/common/mariadb-galera/helm/templates/rolebindings.yaml index 71f7dc3628..6948e7841c 100644 --- a/common/mariadb-galera/helm/templates/rolebindings.yaml +++ b/common/mariadb-galera/helm/templates/rolebindings.yaml @@ -4,7 +4,7 @@ metadata: name: {{ include "commonPrefix" $ }}-configmap-updater namespace: {{ .Release.Namespace }} labels: - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "version" "database" "rolebinding" "database") | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/common/mariadb-galera/helm/templates/roles.yaml b/common/mariadb-galera/helm/templates/roles.yaml index e62f8c0408..f46ab70203 100644 --- a/common/mariadb-galera/helm/templates/roles.yaml +++ b/common/mariadb-galera/helm/templates/roles.yaml @@ -4,7 +4,7 @@ metadata: namespace: {{ $.Release.Namespace }} name: {{ include "commonPrefix" $ }}-configmap-updater labels: - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "version" "database" "role" "database") | indent 4 }} rules: - apiGroups: [""] # at the HTTP level, the name of the resource for accessing ConfigMap objects is "configmaps" diff --git a/common/mariadb-galera/helm/templates/serviceaccount.yaml b/common/mariadb-galera/helm/templates/serviceaccount.yaml index c7fe04779f..738a153067 100644 --- a/common/mariadb-galera/helm/templates/serviceaccount.yaml +++ b/common/mariadb-galera/helm/templates/serviceaccount.yaml @@ -4,5 +4,5 @@ metadata: namespace: {{ .Release.Namespace }} name: {{ include "commonPrefix" $ }}-mariadb-galera labels: - {{- include "sharedservices.labels" $ | indent 4 }} + {{- include "mariadb-galera.labels" (list $ "version" "database" "sa" "database") | indent 4 }} automountServiceAccountToken: false \ No newline at end of file diff --git a/common/mariadb-galera/helm/templates/statefulset-mariadb.yaml b/common/mariadb-galera/helm/templates/statefulset-mariadb.yaml index ca172a7f88..c2c4f84d95 100644 --- a/common/mariadb-galera/helm/templates/statefulset-mariadb.yaml +++ b/common/mariadb-galera/helm/templates/statefulset-mariadb.yaml @@ -9,17 +9,12 @@ kind: StatefulSet metadata: namespace: {{ $.Release.Namespace }} name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "database")) }} - labels: - app: {{ $.Release.Name }} - component: "database" - release: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} spec: replicas: {{ ((include "replicaCount" (dict "global" $ "type" "database")) | int) | default 3 }} serviceName: {{ $.Release.Name }} selector: matchLabels: - component: "database" + app.kubernetes.io/component: {{ (index $.Values.image (printf "%s" "database")).softwarename }}-sts-database revisionHistoryLimit: {{ $.Values.revisionHistoryLimit | default 10 | int }} podManagementPolicy: {{ $.Values.podManagementPolicy | default "OrderedReady" | quote }} updateStrategy: @@ -27,10 +22,7 @@ spec: template: metadata: labels: - app: {{ $.Release.Name }} - component: "database" - release: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 8 }} + {{- include "mariadb-galera.labels" (list $ "version" "database" "sts" "database") | indent 8 }} annotations: {{- if $.Values.monitoring.mysqld_exporter.enabled }} prometheus.io/scrape: "true" @@ -50,27 +42,27 @@ spec: podAffinityTerm: labelSelector: matchExpressions: - - key: "app" + - key: "app.kubernetes.io/part-of" operator: In values: - {{ $.Release.Name | quote }} - - key: "component" + - key: "app.kubernetes.io/component" operator: In values: - - "database" + - {{ (index $.Values.image (printf "%s" "database")).softwarename }}-sts-database topologyKey: "topology.kubernetes.io/zone" - weight: 2 podAffinityTerm: labelSelector: matchExpressions: - - key: "app" + - key: "app.kubernetes.io/part-of" operator: In values: - {{ $.Release.Name | quote }} - - key: "component" + - key: "app.kubernetes.io/component" operator: In values: - - "database" + - {{ (index $.Values.image (printf "%s" "database")).softwarename }}-sts-database topologyKey: "kubernetes.io/hostname" serviceAccount: {{ include "commonPrefix" $ }}-mariadb-galera automountServiceAccountToken: true diff --git a/common/mariadb-galera/helm/templates/statefulset-proxysql.yaml b/common/mariadb-galera/helm/templates/statefulset-proxysql.yaml index ed2bd666db..124e70b9a1 100644 --- a/common/mariadb-galera/helm/templates/statefulset-proxysql.yaml +++ b/common/mariadb-galera/helm/templates/statefulset-proxysql.yaml @@ -14,17 +14,12 @@ kind: StatefulSet metadata: namespace: {{ $.Release.Namespace }} name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "proxysql")) }} - labels: - app: {{ $.Release.Name }} - component: "proxysql" - release: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 4 }} spec: replicas: {{ $.Values.replicas.proxy | default 3 }} serviceName: {{ $.Release.Name }} selector: matchLabels: - component: "proxysql" + app.kubernetes.io/component: {{ (index $.Values.image (printf "%s" "proxysql")).softwarename }}-sts-proxy revisionHistoryLimit: {{ $.Values.revisionHistoryLimit | default 10 | int }} podManagementPolicy: {{ $.Values.podManagementPolicy | default "OrderedReady" | quote }} updateStrategy: @@ -32,10 +27,7 @@ spec: template: metadata: labels: - app: {{ $.Release.Name }} - component: "proxysql" - release: {{ $.Release.Name }} - {{- include "sharedservices.labels" $ | indent 8 }} + {{- include "mariadb-galera.labels" (list $ "version" "proxysql" "sts" "proxy") | indent 8 }} annotations: {{- if $.Values.monitoring.proxy.enabled }} prometheus.io/scrape: "true" @@ -55,36 +47,36 @@ spec: podAffinityTerm: labelSelector: matchExpressions: - - key: "app" + - key: "app.kubernetes.io/part-of" operator: In values: - {{ $.Release.Name | quote }} - - key: "component" + - key: "app.kubernetes.io/component" operator: In values: - - "proxysql" + - {{ (index $.Values.image (printf "%s" "proxysql")).softwarename }}-sts-proxy topologyKey: "topology.kubernetes.io/zone" - weight: 2 podAffinityTerm: labelSelector: matchExpressions: - - key: "app" + - key: "app.kubernetes.io/part-of" operator: In values: - {{ $.Release.Name | quote }} - - key: "component" + - key: "app.kubernetes.io/component" operator: In values: - - "proxysql" + - {{ (index $.Values.image (printf "%s" "proxysql")).softwarename }}-sts-proxy topologyKey: "kubernetes.io/hostname" serviceAccount: {{ include "commonPrefix" $ }}-mariadb-galera securityContext: runAsUser: {{ $.Values.userId.proxy | default 3100 | int }} runAsGroup: {{ $.Values.groupId.proxy | default 3100 | int }} fsGroup: {{ $.Values.groupId.proxy | default 3100 | int }} - {{- if and (hasKey $.Values.image.proxy "pullSecret") $.Values.image.proxy.pullSecret }} + {{- if and (hasKey $.Values.image.proxysql "pullSecret") $.Values.image.proxysql.pullSecret }} imagePullSecrets: - - name: {{ include "commonPrefix" $ }}-{{$.Values.image.proxy.pullSecret}} + - name: {{ include "commonPrefix" $ }}-{{$.Values.image.proxysql.pullSecret}} {{- end }} initContainers: - name: sysctl-tcp-keepalive @@ -127,8 +119,8 @@ spec: {{- end }} containers: - name: {{ (include "nodeNamePrefix" (dict "global" $ "component" "proxysql")) }} - image: "{{ $.Values.image.proxy.registry }}/{{ $.Values.image.proxy.project }}/{{ $.Values.image.proxy.softwarename }}:{{ $.Values.image.proxy.softwareversion }}-{{ $.Values.image.proxy.imageversion | int }}" - imagePullPolicy: {{ $.Values.image.proxy.pullPolicy | default "IfNotPresent" | quote }} + image: "{{ $.Values.image.proxysql.registry }}/{{ $.Values.image.proxysql.project }}/{{ $.Values.image.proxysql.softwarename }}:{{ $.Values.image.proxysql.softwareversion }}-{{ $.Values.image.proxysql.imageversion | int }}" + imagePullPolicy: {{ $.Values.image.proxysql.pullPolicy | default "IfNotPresent" | quote }} securityContext: runAsUser: {{ $.Values.userId.proxy | default 3100 | int }} runAsGroup: {{ $.Values.groupId.proxy | default 3100 | int }} diff --git a/common/mariadb-galera/helm/tests/01-default-statefulset_test.yaml b/common/mariadb-galera/helm/tests/01-default-statefulset_test.yaml index 7da8f6b33c..c079361dd2 100644 --- a/common/mariadb-galera/helm/tests/01-default-statefulset_test.yaml +++ b/common/mariadb-galera/helm/tests/01-default-statefulset_test.yaml @@ -1,8 +1,8 @@ --- checksums: - my.cnf: &mycnf "972f94dfc079c9e66d0b0299f770985337b09c6a2a20f79d8ffe551fedd79edc" - configmap: &configmap "b4e588de0e5967d19297789458fc97ecc1a4b337cdfae330667e2df17874c841" + my.cnf: &mycnf "15aa1b7d620eeacc139ce168ec9469e8fc2ba0164b08f7db2b1125b33f622a4d" + configmap: &configmap "c6c999875ce4cec765178da0938b73faae5a554647ebebe9b8215f4e3302a769" suite: statefulset-mariadb values: @@ -30,15 +30,6 @@ tests: - equal: path: metadata.name value: "testrelease-mariadb-g" - - equal: - path: metadata.labels.app - value: "testrelease" - - equal: - path: metadata.labels.component - value: "database" - - equal: - path: metadata.labels.release - value: "testrelease" - it: metadata with included clustername template: statefulset-mariadb.yaml @@ -55,15 +46,6 @@ tests: - equal: path: metadata.name value: "testrelease-testclustername-mariadb-g" - - equal: - path: metadata.labels.app - value: "testrelease" - - equal: - path: metadata.labels.component - value: "database" - - equal: - path: metadata.labels.release - value: "testrelease" - it: default common spec template: statefulset-mariadb.yaml @@ -77,8 +59,8 @@ tests: path: spec.serviceName value: "testrelease" - equal: - path: spec.selector.matchLabels.component - value: "database" + path: spec.selector.matchLabels["app.kubernetes.io/component"] + value: mariadb-galera-sts-database - equal: path: spec.revisionHistoryLimit value: 3 @@ -116,15 +98,6 @@ tests: set: mariadb.galera.clustername: "testclustername" asserts: - - equal: - path: spec.template.metadata.labels.app - value: "testrelease" - - equal: - path: spec.template.metadata.labels.component - value: "database" - - equal: - path: spec.template.metadata.labels.release - value: "testrelease" - isNull: path: spec.template.metadata.annotations["prometheus.io/scrape"] - isNull: @@ -149,15 +122,6 @@ tests: global.linkerd_enabled: true global.linkerd_requested: true asserts: - - equal: - path: spec.template.metadata.labels.app - value: "testrelease" - - equal: - path: spec.template.metadata.labels.component - value: "database" - - equal: - path: spec.template.metadata.labels.release - value: "testrelease" - equal: path: spec.template.metadata.annotations["prometheus.io/scrape"] value: "true" @@ -209,7 +173,7 @@ tests: asserts: - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].key - value: "app" + value: "app.kubernetes.io/part-of" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].operator value: "In" @@ -218,13 +182,13 @@ tests: value: "testrelease" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[1].key - value: "component" + value: "app.kubernetes.io/component" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[1].operator value: "In" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[1].values[0] - value: "database" + value: "mariadb-galera-sts-database" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].weight value: 1 @@ -233,7 +197,7 @@ tests: value: "topology.kubernetes.io/zone" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[1].podAffinityTerm.labelSelector.matchExpressions[0].key - value: "app" + value: "app.kubernetes.io/part-of" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[1].podAffinityTerm.labelSelector.matchExpressions[0].operator value: "In" @@ -242,13 +206,13 @@ tests: value: "testrelease" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[1].podAffinityTerm.labelSelector.matchExpressions[1].key - value: "component" + value: "app.kubernetes.io/component" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[1].podAffinityTerm.labelSelector.matchExpressions[1].operator value: "In" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[1].podAffinityTerm.labelSelector.matchExpressions[1].values[0] - value: "database" + value: "mariadb-galera-sts-database" - equal: path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[1].weight value: 2 @@ -310,7 +274,7 @@ tests: value: "sysctl-tcp-keepalive" - equal: path: spec.template.spec.initContainers[0].image - value: "keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008" + value: "keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543" - equal: path: spec.template.spec.initContainers[0].imagePullPolicy value: "IfNotPresent" @@ -379,7 +343,7 @@ tests: value: "db" - equal: path: spec.template.spec.containers[0].image - value: "keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240618114008" + value: "keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240724035543" - equal: path: spec.template.spec.containers[0].imagePullPolicy value: "IfNotPresent" @@ -1500,7 +1464,7 @@ tests: value: "metrics" - equal: path: spec.template.spec.containers[1].image - value: "keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-mysqld_exporter:0.14.0-20240618114008" + value: "keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-mysqld_exporter:0.14.0-20240724035543" - equal: path: spec.template.spec.containers[1].imagePullPolicy value: "IfNotPresent" @@ -2142,15 +2106,6 @@ tests: - equal: path: metadata.name value: "testrelease-mariadb-g" - - equal: - path: metadata.labels.app - value: "testrelease" - - equal: - path: metadata.labels.component - value: "database" - - equal: - path: metadata.labels.release - value: "testrelease" - equal: path: spec.replicas value: 1 @@ -2175,15 +2130,6 @@ tests: - equal: path: metadata.name value: "testrelease-mariadb-g" - - equal: - path: metadata.labels.app - value: "testrelease" - - equal: - path: metadata.labels.component - value: "database" - - equal: - path: metadata.labels.release - value: "testrelease" - equal: path: spec.replicas value: 1 @@ -2208,15 +2154,6 @@ tests: - equal: path: metadata.name value: "testrelease-mariadb-g" - - equal: - path: metadata.labels.app - value: "testrelease" - - equal: - path: metadata.labels.component - value: "database" - - equal: - path: metadata.labels.release - value: "testrelease" - equal: path: spec.replicas value: 1 diff --git a/common/mariadb-galera/helm/tests/02-services-mariadb-galera_test.yaml b/common/mariadb-galera/helm/tests/02-services-mariadb-galera_test.yaml index e446098466..31cd6c60ee 100644 --- a/common/mariadb-galera/helm/tests/02-services-mariadb-galera_test.yaml +++ b/common/mariadb-galera/helm/tests/02-services-mariadb-galera_test.yaml @@ -22,9 +22,6 @@ tests: - equal: path: metadata.name value: testrelease-mariadb-g-0 - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP @@ -35,7 +32,7 @@ tests: path: spec.selector["statefulset.kubernetes.io/pod-name"] value: testrelease-mariadb-g-0 - notExists: - path: spec.selector.component + path: spec.selector["app.kubernetes.io/component"] - equal: path: spec.ports[0].name value: galera @@ -103,9 +100,6 @@ tests: - equal: path: metadata.name value: testrelease-mariadb-g-1 - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP @@ -116,7 +110,7 @@ tests: path: spec.selector["statefulset.kubernetes.io/pod-name"] value: testrelease-mariadb-g-1 - notExists: - path: spec.selector.component + path: spec.selector["app.kubernetes.io/component"] - equal: path: spec.ports[0].name value: galera @@ -184,9 +178,6 @@ tests: - equal: path: metadata.name value: testrelease-mariadb-g-2 - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP @@ -197,7 +188,7 @@ tests: path: spec.selector["statefulset.kubernetes.io/pod-name"] value: testrelease-mariadb-g-2 - notExists: - path: spec.selector.component + path: spec.selector["app.kubernetes.io/component"] - equal: path: spec.ports[0].name value: galera @@ -347,9 +338,6 @@ tests: - equal: path: metadata.name value: testrelease-mariadb-g-backend - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP @@ -359,8 +347,8 @@ tests: - notExists: path: spec.selector["statefulset.kubernetes.io/pod-name"] - equal: - path: spec.selector.component - value: database + path: spec.selector["app.kubernetes.io/component"] + value: mariadb-galera-sts-database - equal: path: spec.ports[0].name value: galera @@ -430,17 +418,14 @@ tests: - equal: path: metadata.name value: testrelease-mariadb - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP - notExists: path: spec.clusterIP - equal: - path: spec.selector.component - value: database + path: spec.selector["app.kubernetes.io/component"] + value: mariadb-galera-sts-database - equal: path: spec.ports[0].name value: mysql @@ -474,17 +459,14 @@ tests: - equal: path: metadata.name value: testrelease-mariadb-direct - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP - notExists: path: spec.clusterIP - equal: - path: spec.selector.component - value: database + path: spec.selector["app.kubernetes.io/component"] + value: mariadb-galera-sts-database - equal: path: spec.ports[0].name value: mysql @@ -519,17 +501,14 @@ tests: - equal: path: metadata.name value: testrelease-mariadb-direct - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP - notExists: path: spec.clusterIP - equal: - path: spec.selector.component - value: database + path: spec.selector["app.kubernetes.io/component"] + value: mariadb-galera-sts-database - equal: path: spec.ports[0].name value: mysql @@ -549,7 +528,7 @@ tests: path: spec.sessionAffinityConfig.clientIP.timeoutSeconds value: 28800 - - it: frontend services no second service with proxysql on + - it: frontend services no second service with proxysql on template: service.yaml documentIndex: 5 set: @@ -586,9 +565,6 @@ tests: - equal: path: metadata.name value: testrelease-proxysql-0 - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP @@ -599,7 +575,7 @@ tests: path: spec.selector["statefulset.kubernetes.io/pod-name"] value: testrelease-proxysql-0 - notExists: - path: spec.selector.component + path: spec.selector["app.kubernetes.io/component"] - equal: path: spec.ports[1].name value: proxy @@ -659,9 +635,6 @@ tests: - equal: path: metadata.name value: testrelease-proxysql-1 - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP @@ -672,7 +645,7 @@ tests: path: spec.selector["statefulset.kubernetes.io/pod-name"] value: testrelease-proxysql-1 - notExists: - path: spec.selector.component + path: spec.selector["app.kubernetes.io/component"] - equal: path: spec.ports[1].name value: proxy @@ -731,9 +704,6 @@ tests: - equal: path: metadata.name value: testrelease-proxysql-2 - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP @@ -744,7 +714,7 @@ tests: path: spec.selector["statefulset.kubernetes.io/pod-name"] value: testrelease-proxysql-2 - notExists: - path: spec.selector.component + path: spec.selector["app.kubernetes.io/component"] - equal: path: spec.ports[1].name value: proxy @@ -803,9 +773,6 @@ tests: - equal: path: metadata.name value: testrelease-proxysql-backend - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP @@ -815,8 +782,8 @@ tests: - notExists: path: spec.selector["statefulset.kubernetes.io/pod-name"] - equal: - path: spec.selector.component - value: proxysql + path: spec.selector["app.kubernetes.io/component"] + value: mariadb-galera-proxysql-sts-proxy - equal: path: spec.ports[1].name value: proxy @@ -875,17 +842,14 @@ tests: - equal: path: metadata.name value: testrelease-mariadb - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP - notExists: path: spec.clusterIP - equal: - path: spec.selector.component - value: proxysql + path: spec.selector["app.kubernetes.io/component"] + value: mariadb-galera-proxysql-sts-proxy - equal: path: spec.ports[0].name value: proxy @@ -921,17 +885,14 @@ tests: - equal: path: metadata.name value: testrelease-haproxy-backend - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: LoadBalancer - notExists: path: spec.clusterIP - equal: - path: spec.selector.component - value: haproxy + path: spec.selector["app.kubernetes.io/component"] + value: mariadb-galera-haproxy-deploy-proxy - equal: path: spec.ports[0].name value: stats @@ -964,17 +925,14 @@ tests: - equal: path: metadata.name value: testrelease-mariadb - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: ClusterIP - notExists: path: spec.clusterIP - equal: - path: spec.selector.component - value: haproxy + path: spec.selector["app.kubernetes.io/component"] + value: mariadb-galera-haproxy-deploy-proxy - equal: path: spec.ports[0].name value: proxy @@ -1007,17 +965,14 @@ tests: - equal: path: metadata.name value: testrelease-backup-kopiaserver-frontend - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.type value: LoadBalancer - notExists: path: spec.clusterIP - equal: - path: spec.selector.component - value: kopiaserver + path: spec.selector["app.kubernetes.io/component"] + value: mariadb-galera-kopia-deploy-server - equal: path: spec.ports[0].name value: kopia @@ -1054,9 +1009,6 @@ tests: - notEqual: path: metadata.name value: testrelease-mariadb - - equal: - path: metadata.labels.app - value: testrelease - it: database service name changed if migration option is disabled template: service.yaml @@ -1075,9 +1027,6 @@ tests: - notEqual: path: metadata.name value: testrelease-mariadb-replica - - equal: - path: metadata.labels.app - value: testrelease - it: database backend service external IP added for region 1 template: service.yaml @@ -1094,9 +1043,6 @@ tests: asserts: - isKind: of: Service - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.externalIPs[0] value: "10.0.0.1" @@ -1116,9 +1062,6 @@ tests: asserts: - isKind: of: Service - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.externalIPs[0] value: "10.0.0.2" @@ -1138,9 +1081,6 @@ tests: asserts: - isKind: of: Service - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.externalIPs[0] value: "10.0.0.3" @@ -1160,9 +1100,6 @@ tests: asserts: - isKind: of: Service - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.externalIPs[0] value: "10.0.0.1" @@ -1182,9 +1119,6 @@ tests: asserts: - isKind: of: Service - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.externalIPs[0] value: "10.0.0.2" @@ -1204,9 +1138,6 @@ tests: asserts: - isKind: of: Service - - equal: - path: metadata.labels.app - value: testrelease - equal: path: spec.externalIPs[0] value: "10.0.0.3" diff --git a/common/mariadb-galera/helm/tests/03-configmap-mariadb_test.yaml b/common/mariadb-galera/helm/tests/03-configmap-mariadb_test.yaml index 91a0a7cfc7..fc89858317 100644 --- a/common/mariadb-galera/helm/tests/03-configmap-mariadb_test.yaml +++ b/common/mariadb-galera/helm/tests/03-configmap-mariadb_test.yaml @@ -18,17 +18,8 @@ tests: asserts: - isKind: of: ConfigMap - - equal: - path: metadata.namespace - value: testnamespace - - equal: - path: metadata.name - value: testrelease-mariadb-entrypoint-sh - - equal: - path: metadata.labels.app - value: testrelease - - it: default mariadb common extenden functions scripts + - it: default mariadb common extended functions scripts template: configmap-mariadb.yaml documentIndex: 1 set: @@ -42,9 +33,6 @@ tests: - equal: path: metadata.name value: testrelease-mariadb-common-functions-extended-sh - - equal: - path: metadata.labels.app - value: testrelease - exists: path: data["common-functions-extended.sh"] @@ -83,9 +71,6 @@ tests: - equal: path: metadata.name value: testrelease-mariadb-hooks-sh - - equal: - path: metadata.labels.app - value: testrelease - exists: path: data["pre-stop-hook.sh"] - exists: diff --git a/common/mariadb-galera/helm/tests/07-storageclass_test.yaml b/common/mariadb-galera/helm/tests/07-storageclass_test.yaml index 8fe16e01f5..80702869d0 100644 --- a/common/mariadb-galera/helm/tests/07-storageclass_test.yaml +++ b/common/mariadb-galera/helm/tests/07-storageclass_test.yaml @@ -1,5 +1,5 @@ --- -suite: storageclass +suite: storage values: - default_values.yaml set: diff --git a/common/mariadb-galera/helm/tests/08-containerimages_test.yaml b/common/mariadb-galera/helm/tests/08-containerimages_test.yaml index 9194f71220..272712b997 100644 --- a/common/mariadb-galera/helm/tests/08-containerimages_test.yaml +++ b/common/mariadb-galera/helm/tests/08-containerimages_test.yaml @@ -1,8 +1,7 @@ --- ---- image.registry: &imageRegistry "keppel.eu-de-1.cloud.sap" image.project: &imageProject "ccloud" -image.version: &imageVersion "20240618114008" +image.version: &imageVersion "20240724035543" suite: storage values: @@ -46,10 +45,10 @@ tests: of: StatefulSet - equal: path: spec.template.spec.initContainers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 - equal: path: spec.template.spec.containers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240724035543 - it: container image paths for mariadb-galera with monitoring enabled are correct template: statefulset-mariadb.yaml set: @@ -74,13 +73,13 @@ tests: of: StatefulSet - equal: path: spec.template.spec.initContainers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 - equal: path: spec.template.spec.containers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240724035543 - equal: path: spec.template.spec.containers[1].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-mysqld_exporter:0.14.0-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-mysqld_exporter:0.14.0-20240724035543 - it: container image paths for mariadb-galera with cleanCache and fixFsPermissions initContainers are correct template: statefulset-mariadb.yaml set: @@ -100,13 +99,13 @@ tests: of: StatefulSet - equal: path: spec.template.spec.initContainers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 - equal: path: spec.template.spec.initContainers[1].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 - equal: path: spec.template.spec.containers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240724035543 - it: container image paths for proxysql are correct template: statefulset-proxysql.yaml set: @@ -127,10 +126,10 @@ tests: of: StatefulSet - equal: path: spec.template.spec.initContainers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 - equal: path: spec.template.spec.containers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-proxysql:2.6.3-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-proxysql:2.6.3-20240724035543 - it: container image paths for proxysql with fixFsPermissions initContainers are correct template: statefulset-proxysql.yaml set: @@ -152,13 +151,13 @@ tests: of: StatefulSet - equal: path: spec.template.spec.initContainers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 - equal: path: spec.template.spec.initContainers[1].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 - equal: path: spec.template.spec.containers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-proxysql:2.6.3-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-proxysql:2.6.3-20240724035543 - it: container image paths for haproxy are correct template: deployment-haproxy.yaml set: @@ -174,7 +173,7 @@ tests: of: Deployment - equal: path: spec.template.spec.containers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-haproxy:2.8.10-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-haproxy:2.8.10-20240724035543 - it: container image paths for kopia-server are correct template: deployment-kopia-server.yaml set: @@ -198,10 +197,10 @@ tests: of: Deployment - equal: path: spec.template.spec.initContainers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-ubuntu:22.04-20240724035543 - equal: path: spec.template.spec.containers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopia:0.17.0-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopia:0.17.0-20240724035543 - it: container image paths for kopia-backup cronjob are correct template: cronjob-kopia-backup.yaml set: @@ -220,8 +219,8 @@ tests: of: CronJob - equal: path: spec.jobTemplate.spec.template.spec.containers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopia:0.17.0-20240618114008 - - it: container image paths for kopia-restore job are correct + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopia:0.17.0-20240724035543 + - it: container image paths for the kopia-restore job are correct template: job-kopia-restore.yaml set: image.kopiabackup.registry: *imageRegistry @@ -238,7 +237,7 @@ tests: of: Job - equal: path: spec.template.spec.containers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopia:0.17.0-20240618114008 + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera-kopia:0.17.0-20240724035543 - it: container image paths for mariadb-galera config job are correct template: job-mariadb-config.yaml set: @@ -252,6 +251,4 @@ tests: of: Job - equal: path: spec.template.spec.containers[0].image - value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240618114008 - - + value: keppel.eu-de-1.cloud.sap/ccloud/mariadb-galera:10.5.25-20240724035543 diff --git a/common/mariadb-galera/helm/tests/09-labels_test.yaml b/common/mariadb-galera/helm/tests/09-labels_test.yaml new file mode 100644 index 0000000000..0addab7229 --- /dev/null +++ b/common/mariadb-galera/helm/tests/09-labels_test.yaml @@ -0,0 +1,348 @@ +--- +version: + chart: &chartVersion "0.29.5" + Image: &ImageVersion "20240724035543" + databaseSoftware: &databaseSoftwareVersion "10.5.25" + proxysql: &proxysqlSoftwareVersion "2.6.3" + haproxy: &haproxySoftwareVersion "2.8.10" + kopiabackup: &kopiabackupSoftwareVersion "0.17.0" +suite: metadata +values: + - default_values.yaml +set: + mariadb.galera.clustername: "testclustername" + image.database.softwarename: mariadb-galera + image.database.softwareversion: *databaseSoftwareVersion + image.database.imageversion: *ImageVersion + image.proxysql.softwareversion: *proxysqlSoftwareVersion + image.proxysql.imageversion: *ImageVersion + image.haproxy.softwareversion: *haproxySoftwareVersion + image.haproxy.imageversion: *ImageVersion + image.kopiabackup.softwareversion: *kopiabackupSoftwareVersion + image.kopiabackup.imageversion: *ImageVersion +release: + name: testrelease + namespace: testnamespace +chart: + version: *chartVersion + appVersion: *databaseSoftwareVersion +templates: + - statefulset-mariadb.yaml + - statefulset-proxysql.yaml + - cronjob-kopia-backup.yaml + - deployment-haproxy.yaml + - deployment-kopia-server.yaml + - job-kopia-restore.yaml + - job-mariadb-config.yaml + - configmap-mariadb-my.cnf.yaml + - configmap-mariadb.yaml + - configmap-mariadb-job.yaml + - configmap-proxysql.yaml + - configmap-proxysql.conf.yaml + - configmap-haproxy.yaml + - configmap-kopia.yaml +tests: + - it: labels for the mariadb-galera statefulset are correct + template: statefulset-mariadb.yaml + asserts: + - isKind: + of: StatefulSet + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-sts-database" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/version"] + value: "10.5.25-20240724035543" + - equal: + path: spec.template.metadata.labels["helm.sh/chart"] + value: "mariadb-galera-0.29.5" + - it: labels for the proxysql statefulset are correct + template: statefulset-proxysql.yaml + set: + proxy.enabled: true + proxy.type: "proxysql" + asserts: + - isKind: + of: StatefulSet + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-proxysql-sts-proxy" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/version"] + value: "2.6.3-20240724035543" + - equal: + path: spec.template.metadata.labels["helm.sh/chart"] + value: "mariadb-galera-0.29.5" + - it: labels for the HAProxy deployment are correct + template: deployment-haproxy.yaml + set: + proxy.enabled: true + proxy.type: "haproxy" + asserts: + - isKind: + of: Deployment + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-haproxy-deploy-proxy" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/version"] + value: "2.8.10-20240724035543" + - equal: + path: spec.template.metadata.labels["helm.sh/chart"] + value: "mariadb-galera-0.29.5" + - it: labels for the kopia-server deployment are correct + template: deployment-kopia-server.yaml + set: + mariadb.galera.backup.enabled: true + mariadb.galera.backup.kopia.enabled: true + mariadb.galera.backup.kopia.s3.endpoint: "https://s3.eu-de-1.cloud" + mariadb.galera.backup.kopia.s3.region: "eu-de-1" + mariadb.galera.backup.kopia.s3.bucket: "testbucket" + asserts: + - isKind: + of: Deployment + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-kopia-deploy-server" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/version"] + value: "0.17.0-20240724035543" + - equal: + path: spec.template.metadata.labels["helm.sh/chart"] + value: "mariadb-galera-0.29.5" + - it: labels for the kopia-backup cronjob are correct + template: cronjob-kopia-backup.yaml + set: + mariadb.galera.backup.enabled: true + mariadb.galera.backup.kopia.enabled: true + mariadb.galera.backup.kopia.s3.endpoint: "https://s3.eu-de-1.cloud" + mariadb.galera.backup.kopia.s3.region: "eu-de-1" + mariadb.galera.backup.kopia.s3.bucket: "testbucket" + asserts: + - isKind: + of: CronJob + - equal: + path: spec.jobTemplate.spec.template.metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: spec.jobTemplate.spec.template.metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: spec.jobTemplate.spec.template.metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-kopia-cj-backup" + - equal: + path: spec.jobTemplate.spec.template.metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - equal: + path: spec.jobTemplate.spec.template.metadata.labels["app.kubernetes.io/version"] + value: "0.17.0-20240724035543" + - equal: + path: spec.jobTemplate.spec.template.metadata.labels["helm.sh/chart"] + value: "mariadb-galera-0.29.5" + - it: labels for the kopia-restore job are correct + template: job-kopia-restore.yaml + set: + mariadb.galera.restore.kopia.enabled: true + mariadb.galera.backup.kopia.s3.endpoint: "https://s3.eu-de-1.cloud" + mariadb.galera.backup.kopia.s3.region: "eu-de-1" + mariadb.galera.backup.kopia.s3.bucket: "testbucket" + asserts: + - isKind: + of: Job + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-kopia-job-restore" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/version"] + value: "0.17.0-20240724035543" + - equal: + path: spec.template.metadata.labels["helm.sh/chart"] + value: "mariadb-galera-0.29.5" + - it: labels for the mariadb-galera config job are correct + template: job-mariadb-config.yaml + asserts: + - isKind: + of: Job + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-job-config" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - equal: + path: spec.template.metadata.labels["app.kubernetes.io/version"] + value: "10.5.25-20240724035543" + - equal: + path: spec.template.metadata.labels["helm.sh/chart"] + value: "mariadb-galera-0.29.5" + - it: labels for the mariadb-galera entrypoint configmap are correct + template: configmap-mariadb.yaml + documentSelector: + path: metadata.name + value: testrelease-mariadb-entrypoint-sh + asserts: + - isKind: + of: ConfigMap + - equal: + path: metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-cm-entrypoint" + - equal: + path: metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - it: labels for the mariadb-galera functions configmap are correct + template: configmap-mariadb.yaml + documentSelector: + path: metadata.name + value: testrelease-mariadb-common-functions-extended-sh + asserts: + - isKind: + of: ConfigMap + - equal: + path: metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-cm-functions" + - equal: + path: metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - it: labels for the mariadb-galera probes configmap are correct + template: configmap-mariadb.yaml + documentSelector: + path: metadata.name + value: testrelease-mariadb-probes-sh + asserts: + - isKind: + of: ConfigMap + - equal: + path: metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-cm-probes" + - equal: + path: metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - it: labels for the mariadb-galera hooks configmap are correct + template: configmap-mariadb.yaml + documentSelector: + path: metadata.name + value: testrelease-mariadb-hooks-sh + asserts: + - isKind: + of: ConfigMap + - equal: + path: metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-cm-hooks" + - equal: + path: metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - it: labels for the mariadb-galera galerastatus configmap are correct + template: configmap-mariadb.yaml + documentSelector: + path: metadata.name + value: testrelease-galerastatus + asserts: + - isKind: + of: ConfigMap + - equal: + path: metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-cm-status" + - equal: + path: metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" + - it: labels for the mariadb-galera wipedata configmap are correct + template: configmap-mariadb.yaml + documentSelector: + path: metadata.name + value: testrelease-mariadb-wipedata + asserts: + - isKind: + of: ConfigMap + - equal: + path: metadata.labels["app.kubernetes.io/name"] + value: "mariadb-galera" + - equal: + path: metadata.labels["app.kubernetes.io/instance"] + value: "mariadb-galera-testrelease" + - equal: + path: metadata.labels["app.kubernetes.io/component"] + value: "mariadb-galera-cm-wipedata" + - equal: + path: metadata.labels["app.kubernetes.io/part-of"] + value: "testrelease" diff --git a/common/mariadb-galera/helm/values.yaml b/common/mariadb-galera/helm/values.yaml index 3ee71a1a58..eff824cf50 100644 --- a/common/mariadb-galera/helm/values.yaml +++ b/common/mariadb-galera/helm/values.yaml @@ -760,7 +760,7 @@ image: # -- software version part of the image version that should be pulled softwareversion: 22.04 # -- image part of the image version that should be pulled - imageversion: 20240618114008 + imageversion: 20240724035543 # -- (string) `Always` to enforce that the image will be pulled even if it is already available on the worker node # @default -- IfNotPresent pullPolicy: @@ -776,7 +776,7 @@ image: # -- software version part of the image version that should be pulled softwareversion: 10.5.25 # -- image part of the image version that should be pulled - imageversion: 20240618114008 + imageversion: 20240724035543 # -- (string) `Always` to enforce that the image will be pulled even if it is already available on the worker node # @default -- IfNotPresent pullPolicy: @@ -792,13 +792,13 @@ image: # -- software version part of the image version that should be pulled softwareversion: 0.14.0 # -- image part of the image version that should be pulled - imageversion: 20240618114008 + imageversion: 20240724035543 # -- (string) `Always` to enforce that the image will be pulled even if it is already available on the worker node # @default -- IfNotPresent pullPolicy: # -- name of the defined Kubernetes secret defined in `image.pullSecrets` that should be used for container registry authentication pullSecret: - proxy: + proxysql: # -- hostname of the image registry used to pull the proxy image that contains the ProxySQL software to load balance MariaDB connections registry: keppel.eu-de-1.cloud.sap # -- project/tenant used in the image registry @@ -808,7 +808,7 @@ image: # -- software version part of the image version that should be pulled softwareversion: 2.6.3 # -- image part of the image version that should be pulled - imageversion: 20240618114008 + imageversion: 20240724035543 # -- (string) `Always` to enforce that the image will be pulled even if it is already available on the worker node # @default -- IfNotPresent pullPolicy: @@ -824,7 +824,7 @@ image: # -- software version part of the image version that should be pulled softwareversion: 0.17.0 # -- image part of the image version that should be pulled - imageversion: 20240618114008 + imageversion: 20240724035543 # -- (string) `Always` to enforce that the image will be pulled even if it is already available on the worker node # @default -- IfNotPresent pullPolicy: @@ -840,7 +840,7 @@ image: # -- software version part of the image version that should be pulled softwareversion: 2.8.10 # -- image part of the image version that should be pulled - imageversion: 20240614163411 + imageversion: 20240724035543 # -- (string) `Always` to enforce that the image will be pulled even if it is already available on the worker node # @default -- IfNotPresent pullPolicy: