Skip to content

Commit

Permalink
chore(Matomo): update mariadb crds to support v0.22.0
Browse files Browse the repository at this point in the history
Signed-off-by: Philip Miglinci <[email protected]>
  • Loading branch information
pmig committed Apr 30, 2024
1 parent b9c60a9 commit 9ad7e88
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import eu.glasskube.operator.config.ConfigService
import eu.glasskube.operator.generic.condition.MariaDBReadyCondition
import eu.glasskube.operator.infra.mariadb.Exporter
import eu.glasskube.operator.infra.mariadb.MariaDB
import eu.glasskube.operator.infra.mariadb.MariaDBImage
import eu.glasskube.operator.infra.mariadb.MariaDBResources
import eu.glasskube.operator.infra.mariadb.MariaDBResourcesRequest
import eu.glasskube.operator.infra.mariadb.MariaDBSpec
Expand Down Expand Up @@ -60,7 +59,7 @@ class MatomoMariaDB(private val configService: ConfigService) :
}
spec = MariaDBSpec(
rootPasswordSecretKeyRef = secretKeySelector(primary.databaseSecretName, ROOT_DATABASE_PASSWORD),
image = MariaDBImage("mariadb", "10.7.4", "IfNotPresent"),
image = "mariadb:10.7.4",
database = primary.databaseName,
username = primary.databaseUser,
passwordSecretKeyRef = secretKeySelector(primary.databaseSecretName, MATOMO_DATABASE_PASSWORD),
Expand All @@ -75,7 +74,7 @@ class MatomoMariaDB(private val configService: ConfigService) :
),
metrics = Metrics(
exporter = Exporter(
image = MariaDBImage("prom/mysqld-exporter", "v0.14.0", "IfNotPresent")
image = "prom/mysqld-exporter:v0.14.0"
),
serviceMonitor = ServiceMonitor(
prometheusRelease = "kube-prometheus-stack"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package eu.glasskube.operator.infra.mariadb

data class Exporter(
val image: MariaDBImage,
val image: String,
var imagePullPolicy: String = "IfNotPresent",
val resources: MariaDBResources? = null
)
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ import io.fabric8.kubernetes.client.CustomResource
import io.fabric8.kubernetes.model.annotation.Group
import io.fabric8.kubernetes.model.annotation.Version

data class MariaDBImage(
var repository: String,
var tag: String,
var pullPolicy: String? = null
)

data class MariaDBResourcesRequest(
val storage: String? = null,
val cpu: String? = null,
Expand All @@ -36,7 +30,8 @@ data class MariaDBVolumeClaimTemplate(

data class MariaDBSpec(
var rootPasswordSecretKeyRef: SecretKeySelector,
var image: MariaDBImage,
var image: String,
var imagePullPolicy: String = "IfNotPresent",
var database: String?,
var username: String?,
var passwordSecretKeyRef: SecretKeySelector?,
Expand Down

0 comments on commit 9ad7e88

Please sign in to comment.