feat: add enabled property to postgres backups spec (#357)

glasskube · Oct 12, 2023 · 345cdfc · 345cdfc
1 parent 3f84c22
commit 345cdfc
Show file tree

Hide file tree

Showing 46 changed files with 165 additions and 83 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/deploy/crd/giteas.glasskube.eu-v1.yml b/deploy/crd/giteas.glasskube.eu-v1.yml
@@ -91,6 +91,8 @@ spec:
  type: integer
  backups:
  properties:
+ enabled:
+ type: boolean
  schedule:
  type: string
  retentionPolicy:
@@ -133,8 +135,6 @@ spec:
  - accessKeySecret
  - secretKeySecret
  type: object
- required:
- - s3
  type: object
  storage:
  properties:

diff --git a/deploy/crd/gitlabs.glasskube.eu-v1.yml b/deploy/crd/gitlabs.glasskube.eu-v1.yml
@@ -153,6 +153,8 @@ spec:
  type: integer
  backups:
  properties:
+ enabled:
+ type: boolean
  schedule:
  type: string
  retentionPolicy:
@@ -195,8 +197,6 @@ spec:
  - accessKeySecret
  - secretKeySecret
  type: object
- required:
- - s3
  type: object
  storage:
  properties:

diff --git a/deploy/crd/glitchtips.glasskube.eu-v1.yml b/deploy/crd/glitchtips.glasskube.eu-v1.yml
@@ -81,6 +81,8 @@ spec:
  type: integer
  backups:
  properties:
+ enabled:
+ type: boolean
  schedule:
  type: string
  retentionPolicy:
@@ -123,8 +125,6 @@ spec:
  - accessKeySecret
  - secretKeySecret
  type: object
- required:
- - s3
  type: object
  storage:
  properties:

diff --git a/deploy/crd/keycloaks.glasskube.eu-v1.yml b/deploy/crd/keycloaks.glasskube.eu-v1.yml
@@ -59,6 +59,8 @@ spec:
  type: integer
  backups:
  properties:
+ enabled:
+ type: boolean
  schedule:
  type: string
  retentionPolicy:
@@ -101,8 +103,6 @@ spec:
  - accessKeySecret
  - secretKeySecret
  type: object
- required:
- - s3
  type: object
  storage:
  properties:

diff --git a/deploy/crd/metabases.glasskube.eu-v1.yml b/deploy/crd/metabases.glasskube.eu-v1.yml
@@ -77,6 +77,8 @@ spec:
  type: integer
  backups:
  properties:
+ enabled:
+ type: boolean
  schedule:
  type: string
  retentionPolicy:
@@ -119,8 +121,6 @@ spec:
  - accessKeySecret
  - secretKeySecret
  type: object
- required:
- - s3
  type: object
  storage:
  properties:

diff --git a/deploy/crd/nextclouds.glasskube.eu-v1.yml b/deploy/crd/nextclouds.glasskube.eu-v1.yml
@@ -170,6 +170,8 @@ spec:
  type: integer
  backups:
  properties:
+ enabled:
+ type: boolean
  schedule:
  type: string
  retentionPolicy:
@@ -212,8 +214,6 @@ spec:
  - accessKeySecret
  - secretKeySecret
  type: object
- required:
- - s3
  type: object
  storage:
  properties:

diff --git a/deploy/crd/odoos.glasskube.eu-v1.yml b/deploy/crd/odoos.glasskube.eu-v1.yml
@@ -56,6 +56,8 @@ spec:
  type: integer
  backups:
  properties:
+ enabled:
+ type: boolean
  schedule:
  type: string
  retentionPolicy:
@@ -98,8 +100,6 @@ spec:
  - accessKeySecret
  - secretKeySecret
  type: object
- required:
- - s3
  type: object
  storage:
  properties:

diff --git a/deploy/crd/planes.glasskube.eu-v1.yml b/deploy/crd/planes.glasskube.eu-v1.yml
@@ -243,6 +243,8 @@ spec:
  type: integer
  backups:
  properties:
+ enabled:
+ type: boolean
  schedule:
  type: string
  retentionPolicy:
@@ -285,8 +287,6 @@ spec:
  - accessKeySecret
  - secretKeySecret
  type: object
- required:
- - s3
  type: object
  storage:
  properties:

diff --git a/deploy/crd/vaults.glasskube.eu-v1.yml b/deploy/crd/vaults.glasskube.eu-v1.yml
@@ -113,6 +113,8 @@ spec:
  type: integer
  backups:
  properties:
+ enabled:
+ type: boolean
  schedule:
  type: string
  retentionPolicy:
@@ -155,8 +157,6 @@ spec:
  - accessKeySecret
  - secretKeySecret
  type: object
- required:
- - s3
  type: object
  storage:
  properties:

diff --git a/...rc/main/kotlin/eu/glasskube/operator/apps/common/database/postgres/PostgresBackupsSpec.kt b/...rc/main/kotlin/eu/glasskube/operator/apps/common/database/postgres/PostgresBackupsSpec.kt
@@ -5,10 +5,10 @@ import io.fabric8.generator.annotation.Required
 import io.fabric8.kubernetes.api.model.SecretKeySelector
 
 data class PostgresBackupsSpec(
+ val enabled: Boolean = true,
  val schedule: String?,
  val retentionPolicy: String?,
- @field:Required
- val s3: S3Spec
+ val s3: S3Spec?
 ) : BackupsSpec {
  data class S3Spec(
  val endpoint: String?,

diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/gitea/GiteaReconciler.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/gitea/GiteaReconciler.kt
@@ -49,7 +49,8 @@ import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent
  Dependent(
  type = GiteaPostgresBackup::class,
  name = "GiteaPostgresBackup",
- dependsOn = ["GiteaPostgresCluster"]
+ dependsOn = ["GiteaPostgresCluster"],
+ reconcilePrecondition = GiteaPostgresBackup.ReconcilePrecondition::class
  ),
  Dependent(
  type = GiteaConfigMap::class,

diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/gitea/dependent/GiteaMinioBucket.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/gitea/dependent/GiteaMinioBucket.kt
@@ -5,7 +5,7 @@ import eu.glasskube.operator.apps.gitea.Gitea
 import eu.glasskube.operator.apps.gitea.GiteaReconciler
 import eu.glasskube.operator.apps.gitea.genericResourceName
 import eu.glasskube.operator.apps.gitea.resourceLabels
-import eu.glasskube.operator.generic.dependent.postgres.PostgresWithoutBackupsSpecCondition
+import eu.glasskube.operator.generic.dependent.postgres.backup.PostgresMinioBucketPrecondition
 import eu.glasskube.operator.infra.minio.MinioBucket
 import eu.glasskube.operator.infra.minio.MinioBucketSpec
 import eu.glasskube.operator.infra.minio.minioBucket
@@ -15,7 +15,7 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDep
 
 @KubernetesDependent(labelSelector = GiteaReconciler.SELECTOR)
 class GiteaMinioBucket : CRUDKubernetesDependentResource<MinioBucket, Gitea>(MinioBucket::class.java) {
- internal class ReconcilePrecondition : PostgresWithoutBackupsSpecCondition<MinioBucket, Gitea>()
+ internal class ReconcilePrecondition : PostgresMinioBucketPrecondition<MinioBucket, Gitea>()
 
  override fun desired(primary: Gitea, context: Context<Gitea>) = minioBucket {
  metadata {

diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/gitea/dependent/GiteaPostgresBackup.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/gitea/dependent/GiteaPostgresBackup.kt
@@ -6,4 +6,6 @@ import eu.glasskube.operator.generic.dependent.postgres.DependentPostgresSchedul
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent
 
 @KubernetesDependent(labelSelector = GiteaReconciler.SELECTOR)
-class GiteaPostgresBackup : DependentPostgresScheduledBackup<Gitea>(Gitea.Postgres)
+class GiteaPostgresBackup : DependentPostgresScheduledBackup<Gitea>(Gitea.Postgres) {
+ class ReconcilePrecondition : DependentPostgresScheduledBackup.ReconcilePrecondition<Gitea>()
+}
diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/gitlab/GitlabReconciler.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/gitlab/GitlabReconciler.kt
@@ -47,7 +47,8 @@ import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent
  Dependent(
  type = GitlabPostgresBackup::class,
  name = "GitlabPostgresBackup",
- dependsOn = ["GitlabPostgresCluster"]
+ dependsOn = ["GitlabPostgresCluster"],
+ reconcilePrecondition = GitlabPostgresBackup.ReconcilePrecondition::class
  ),
  Dependent(
  type = GitlabDeployment::class,

diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/gitlab/dependent/GitlabMinioBucket.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/gitlab/dependent/GitlabMinioBucket.kt
@@ -5,7 +5,7 @@ import eu.glasskube.operator.apps.gitlab.Gitlab
 import eu.glasskube.operator.apps.gitlab.GitlabReconciler
 import eu.glasskube.operator.apps.gitlab.genericResourceName
 import eu.glasskube.operator.apps.gitlab.resourceLabels
-import eu.glasskube.operator.generic.dependent.postgres.PostgresWithoutBackupsSpecCondition
+import eu.glasskube.operator.generic.dependent.postgres.backup.PostgresMinioBucketPrecondition
 import eu.glasskube.operator.infra.minio.MinioBucket
 import eu.glasskube.operator.infra.minio.MinioBucketSpec
 import eu.glasskube.operator.infra.minio.minioBucket
@@ -15,7 +15,7 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDep
 
 @KubernetesDependent(labelSelector = GitlabReconciler.SELECTOR)
 class GitlabMinioBucket : CRUDKubernetesDependentResource<MinioBucket, Gitlab>(MinioBucket::class.java) {
- internal class ReconcilePrecondition : PostgresWithoutBackupsSpecCondition<MinioBucket, Gitlab>()
+ internal class ReconcilePrecondition : PostgresMinioBucketPrecondition<MinioBucket, Gitlab>()
 
  override fun desired(primary: Gitlab, context: Context<Gitlab>) = minioBucket {
  metadata {

diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/gitlab/dependent/GitlabPostgresBackup.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/gitlab/dependent/GitlabPostgresBackup.kt
@@ -6,4 +6,6 @@ import eu.glasskube.operator.generic.dependent.postgres.DependentPostgresSchedul
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent
 
 @KubernetesDependent(labelSelector = GitlabReconciler.SELECTOR)
-class GitlabPostgresBackup : DependentPostgresScheduledBackup<Gitlab>(Gitlab.Postgres)
+class GitlabPostgresBackup : DependentPostgresScheduledBackup<Gitlab>(Gitlab.Postgres) {
+ class ReconcilePrecondition : DependentPostgresScheduledBackup.ReconcilePrecondition<Gitlab>()
+}
diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/glitchtip/GlitchtipReconciler.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/glitchtip/GlitchtipReconciler.kt
@@ -48,7 +48,8 @@ import kotlin.jvm.optionals.getOrDefault
  Dependent(
  type = GlitchtipPostgresBackup::class,
  name = "GlitchtipPostgresBackup",
- dependsOn = ["GlitchtipPostgresCluster"]
+ dependsOn = ["GlitchtipPostgresCluster"],
+ reconcilePrecondition = GlitchtipPostgresBackup.ReconcilePrecondition::class
  ),
  Dependent(
  type = GlitchtipConfigMap::class,

diff --git a/...or/src/main/kotlin/eu/glasskube/operator/apps/glitchtip/dependent/GlitchtipMinioBucket.kt b/...or/src/main/kotlin/eu/glasskube/operator/apps/glitchtip/dependent/GlitchtipMinioBucket.kt
@@ -5,7 +5,7 @@ import eu.glasskube.operator.apps.glitchtip.Glitchtip
 import eu.glasskube.operator.apps.glitchtip.GlitchtipReconciler
 import eu.glasskube.operator.apps.glitchtip.genericResourceName
 import eu.glasskube.operator.apps.glitchtip.resourceLabels
-import eu.glasskube.operator.generic.dependent.postgres.PostgresWithoutBackupsSpecCondition
+import eu.glasskube.operator.generic.dependent.postgres.backup.PostgresMinioBucketPrecondition
 import eu.glasskube.operator.infra.minio.MinioBucket
 import eu.glasskube.operator.infra.minio.MinioBucketSpec
 import eu.glasskube.operator.infra.minio.minioBucket
@@ -15,7 +15,7 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDep
 
 @KubernetesDependent(labelSelector = GlitchtipReconciler.SELECTOR)
 class GlitchtipMinioBucket : CRUDKubernetesDependentResource<MinioBucket, Glitchtip>(MinioBucket::class.java) {
- internal class ReconcilePrecondition : PostgresWithoutBackupsSpecCondition<MinioBucket, Glitchtip>()
+ internal class ReconcilePrecondition : PostgresMinioBucketPrecondition<MinioBucket, Glitchtip>()
 
  override fun desired(primary: Glitchtip, context: Context<Glitchtip>) = minioBucket {
  metadata {

diff --git a/...src/main/kotlin/eu/glasskube/operator/apps/glitchtip/dependent/GlitchtipPostgresBackup.kt b/...src/main/kotlin/eu/glasskube/operator/apps/glitchtip/dependent/GlitchtipPostgresBackup.kt
@@ -6,4 +6,6 @@ import eu.glasskube.operator.generic.dependent.postgres.DependentPostgresSchedul
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent
 
 @KubernetesDependent(labelSelector = GlitchtipReconciler.SELECTOR)
-class GlitchtipPostgresBackup : DependentPostgresScheduledBackup<Glitchtip>(Glitchtip.Postgres)
+class GlitchtipPostgresBackup : DependentPostgresScheduledBackup<Glitchtip>(Glitchtip.Postgres) {
+ class ReconcilePrecondition : DependentPostgresScheduledBackup.ReconcilePrecondition<Glitchtip>()
+}
diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/keycloak/KeycloakReconciler.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/keycloak/KeycloakReconciler.kt
@@ -39,7 +39,8 @@ import kotlin.jvm.optionals.getOrDefault
  Dependent(
  type = KeycloakPostgresBackup::class,
  name = "KeycloakPostgresBackup",
- dependsOn = ["KeycloakPostgresCluster"]
+ dependsOn = ["KeycloakPostgresCluster"],
+ reconcilePrecondition = KeycloakPostgresBackup.ReconcilePrecondition::class
  ),
  Dependent(
  type = KeycloakDeployment::class,

diff --git a/...r/src/main/kotlin/eu/glasskube/operator/apps/keycloak/dependent/KeycloakPostgresBackup.kt b/...r/src/main/kotlin/eu/glasskube/operator/apps/keycloak/dependent/KeycloakPostgresBackup.kt
@@ -6,4 +6,6 @@ import eu.glasskube.operator.generic.dependent.postgres.DependentPostgresSchedul
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent
 
 @KubernetesDependent(labelSelector = KeycloakReconciler.SELECTOR)
-class KeycloakPostgresBackup : DependentPostgresScheduledBackup<Keycloak>(Keycloak.Postgres)
+class KeycloakPostgresBackup : DependentPostgresScheduledBackup<Keycloak>(Keycloak.Postgres) {
+ class ReconcilePrecondition : DependentPostgresScheduledBackup.ReconcilePrecondition<Keycloak>()
+}
diff --git a/...main/kotlin/eu/glasskube/operator/apps/keycloak/dependent/KeycloakPostgresBackupBucket.kt b/...main/kotlin/eu/glasskube/operator/apps/keycloak/dependent/KeycloakPostgresBackupBucket.kt
@@ -6,7 +6,7 @@ import eu.glasskube.operator.apps.keycloak.Keycloak
 import eu.glasskube.operator.apps.keycloak.KeycloakReconciler
 import eu.glasskube.operator.apps.keycloak.backupBucketName
 import eu.glasskube.operator.apps.keycloak.resourceLabels
-import eu.glasskube.operator.generic.dependent.postgres.PostgresWithoutBackupsSpecCondition
+import eu.glasskube.operator.generic.dependent.postgres.backup.PostgresMinioBucketPrecondition
 import eu.glasskube.operator.infra.minio.MinioBucket
 import eu.glasskube.operator.infra.minio.MinioBucketSpec
 import eu.glasskube.operator.infra.minio.minioBucket
@@ -16,7 +16,7 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDep
 
 @KubernetesDependent(labelSelector = KeycloakReconciler.SELECTOR)
 class KeycloakPostgresBackupBucket : CRUDKubernetesDependentResource<MinioBucket, Keycloak>(MinioBucket::class.java) {
- internal class ReconcilePrecondition : PostgresWithoutBackupsSpecCondition<MinioBucket, Keycloak>()
+ internal class ReconcilePrecondition : PostgresMinioBucketPrecondition<MinioBucket, Keycloak>()
 
  override fun desired(primary: Keycloak, context: Context<Keycloak>) = minioBucket {
  metadata {

diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/metabase/MetabaseReconciler.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/metabase/MetabaseReconciler.kt
@@ -37,7 +37,8 @@ import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent
  Dependent(
  type = MetabasePostgresBackup::class,
  name = "MetabasePostgresBackup",
- dependsOn = ["MetabasePostgresCluster"]
+ dependsOn = ["MetabasePostgresCluster"],
+ reconcilePrecondition = MetabasePostgresBackup.ReconcilePrecondition::class
  ),
  Dependent(
  type = MetabaseConfigMap::class,

diff --git a/...ator/src/main/kotlin/eu/glasskube/operator/apps/metabase/dependent/MetabaseMinioBucket.kt b/...ator/src/main/kotlin/eu/glasskube/operator/apps/metabase/dependent/MetabaseMinioBucket.kt
@@ -5,7 +5,7 @@ import eu.glasskube.operator.apps.metabase.Metabase
 import eu.glasskube.operator.apps.metabase.MetabaseReconciler
 import eu.glasskube.operator.apps.metabase.genericResourceName
 import eu.glasskube.operator.apps.metabase.resourceLabels
-import eu.glasskube.operator.generic.dependent.postgres.PostgresWithoutBackupsSpecCondition
+import eu.glasskube.operator.generic.dependent.postgres.backup.PostgresMinioBucketPrecondition
 import eu.glasskube.operator.infra.minio.MinioBucket
 import eu.glasskube.operator.infra.minio.MinioBucketSpec
 import eu.glasskube.operator.infra.minio.minioBucket
@@ -15,7 +15,7 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDep
 
 @KubernetesDependent(labelSelector = MetabaseReconciler.SELECTOR)
 class MetabaseMinioBucket : CRUDKubernetesDependentResource<MinioBucket, Metabase>(MinioBucket::class.java) {
- internal class ReconcilePrecondition : PostgresWithoutBackupsSpecCondition<MinioBucket, Metabase>()
+ internal class ReconcilePrecondition : PostgresMinioBucketPrecondition<MinioBucket, Metabase>()
 
  override fun desired(primary: Metabase, context: Context<Metabase>) = minioBucket {
  metadata {

diff --git a/...r/src/main/kotlin/eu/glasskube/operator/apps/metabase/dependent/MetabasePostgresBackup.kt b/...r/src/main/kotlin/eu/glasskube/operator/apps/metabase/dependent/MetabasePostgresBackup.kt
@@ -6,4 +6,6 @@ import eu.glasskube.operator.generic.dependent.postgres.DependentPostgresSchedul
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent
 
 @KubernetesDependent(labelSelector = MetabaseReconciler.SELECTOR)
-class MetabasePostgresBackup : DependentPostgresScheduledBackup<Metabase>(Metabase.Postgres)
+class MetabasePostgresBackup : DependentPostgresScheduledBackup<Metabase>(Metabase.Postgres) {
+ class ReconcilePrecondition : DependentPostgresScheduledBackup.ReconcilePrecondition<Metabase>()
+}
diff --git a/operator/src/main/kotlin/eu/glasskube/operator/apps/nextcloud/NextcloudReconciler.kt b/operator/src/main/kotlin/eu/glasskube/operator/apps/nextcloud/NextcloudReconciler.kt
@@ -55,7 +55,8 @@ import kotlin.jvm.optionals.getOrDefault
  Dependent(
  type = NextcloudPostgresBackup::class,
  name = "NextcloudPostgresBackup",
- dependsOn = ["NextcloudPostgresCluster"]
+ dependsOn = ["NextcloudPostgresCluster"],
+ reconcilePrecondition = NextcloudPostgresBackup.ReconcilePrecondition::class
  ),
  Dependent(
  type = NextcloudDeployment::class,

diff --git a/...or/src/main/kotlin/eu/glasskube/operator/apps/nextcloud/dependent/NextcloudMinioBucket.kt b/...or/src/main/kotlin/eu/glasskube/operator/apps/nextcloud/dependent/NextcloudMinioBucket.kt
@@ -6,7 +6,7 @@ import eu.glasskube.operator.apps.nextcloud.Nextcloud
 import eu.glasskube.operator.apps.nextcloud.NextcloudReconciler
 import eu.glasskube.operator.apps.nextcloud.databaseBackupBucketName
 import eu.glasskube.operator.apps.nextcloud.resourceLabels
-import eu.glasskube.operator.generic.dependent.postgres.PostgresWithoutBackupsSpecCondition
+import eu.glasskube.operator.generic.dependent.postgres.backup.PostgresMinioBucketPrecondition
 import eu.glasskube.operator.infra.minio.MinioBucket
 import eu.glasskube.operator.infra.minio.MinioBucketSpec
 import eu.glasskube.operator.infra.minio.minioBucket
@@ -16,7 +16,7 @@ import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDep
 
 @KubernetesDependent(labelSelector = NextcloudReconciler.SELECTOR)
 class NextcloudMinioBucket : CRUDKubernetesDependentResource<MinioBucket, Nextcloud>(MinioBucket::class.java) {
- internal class ReconcilePrecondition : PostgresWithoutBackupsSpecCondition<MinioBucket, Nextcloud>()
+ internal class ReconcilePrecondition : PostgresMinioBucketPrecondition<MinioBucket, Nextcloud>()
 
  override fun desired(primary: Nextcloud, context: Context<Nextcloud>) = minioBucket {
  metadata {