Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(Matomo): update mariadb crds to support v0.22.0 #434

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(Matomo): update mariadb crds to support v0.22.0 #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions operator/src/main/kotlin/eu/glasskube/operator/apps/matomo/dependent/MatomoMariaDB.kt
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion operator/src/main/kotlin/eu/glasskube/operator/infra/mariadb/Exporter.kt
View file
Open in desktop
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
)
9 changes: 2 additions & 7 deletions operator/src/main/kotlin/eu/glasskube/operator/infra/mariadb/MariaDB.kt
View file
Open in desktop
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