Skip to content

Commit

Permalink
refactor(Matomo): remove startup probe, add log statement
Browse files Browse the repository at this point in the history
Signed-off-by: Philip Miglinci <pmig@glasskube.eu>
  • Loading branch information
pmig committed Sep 8, 2023
1 parent 6b4db59 commit 72f324d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import eu.glasskube.operator.apps.matomo.dependent.MatomoIngress
import eu.glasskube.operator.apps.matomo.dependent.MatomoMariaDB
import eu.glasskube.operator.apps.matomo.dependent.MatomoService
import eu.glasskube.operator.apps.matomo.dependent.MatomoVolume
import eu.glasskube.utils.logger
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim
import io.fabric8.kubernetes.api.model.Secret
import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition
Expand Down Expand Up @@ -68,6 +69,7 @@ class MatomoReconciler(private val kubernetesClient: KubernetesClient) :
context.getSecondaryResources(PersistentVolumeClaim::class.java)
.filter { it.metadata.name.endsWith("-misc") }
.forEach {
log.info("Deleting old persisted volume claim ${it.metadata.name}")
kubernetesClient.persistentVolumeClaims().resource(it).delete()
}

Expand All @@ -82,5 +84,6 @@ class MatomoReconciler(private val kubernetesClient: KubernetesClient) :
const val LABEL = "glasskube.eu/Matomo"
const val SELECTOR = "app.kubernetes.io/managed-by=glasskube-operator,app=$APP_NAME"
internal const val SECRET_EVENT_SOURCE = "MatomoSecretEventSource"
private val log = logger()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import eu.glasskube.kubernetes.api.model.readinessProbe
import eu.glasskube.kubernetes.api.model.secret
import eu.glasskube.kubernetes.api.model.secretRef
import eu.glasskube.kubernetes.api.model.spec
import eu.glasskube.kubernetes.api.model.startupProbe
import eu.glasskube.kubernetes.api.model.volume
import eu.glasskube.kubernetes.api.model.volumeMount
import eu.glasskube.kubernetes.api.model.volumeMounts
Expand Down Expand Up @@ -147,16 +146,6 @@ class MatomoDeployment : CRUDKubernetesDependentResource<Deployment, Matomo>(Dep
mountPath = htmlDir
}
}
startupProbe {
periodSeconds = 10
successThreshold = 1
// If the container is still unresponsive after 10 minutes, it will be restarted
failureThreshold = 60
httpGet {
path = PROBE_PATH
port = "http".intOrString()
}
}
livenessProbe {
periodSeconds = 10
successThreshold = 1
Expand Down

0 comments on commit 72f324d

Please sign in to comment.