feat(crdb): use crdb native backup and s3 backup added (#1915)

* fix(zitadelctl): implement takedown command

* fix(zitadelctl): correct destroy flow

* fix(zitadelctl): correct backup commands to read crds beforehand

* fix: add of destroyfile

* fix: clean for userlist

* fix: change backup and restore to crdb native

* fix: timeout for delete pvc for cockroachdb

* fix: corrected unit tests

* fix: add ignored file for scale

* fix: correct handling of gitops in backup command

* feat: add s3 backup kind

* fix: backuplist for s3 and timeout for pv deletion

* fix(database): fix nil pointer with binary version

* fix(database): cleanup of errors which cam with merging of the s3 logic

* fix: correct unit tests

* fix: cleanup monitor output

Co-authored-by: Elio Bischof <[email protected]>

* fix: backup imagepullpolixy to ifnotpresent

Co-authored-by: Elio Bischof <[email protected]>

operator/database/kinds/databases/managed/adapt.go

@@ -33,6 +33,8 @@ const (
 	privateServiceName = SfsName
 	cockroachPort      = int32(26257)
 	cockroachHTTPPort  = int32(8080)
+	Clean              = "clean"
+	DBReady            = "dbready"
 )
 
 func Adapter(
@@ -89,14 +91,14 @@ func Adapter(
 
 		var (
 			isFeatureDatabase bool
-			isFeatureRestore  bool
+			isFeatureClean    bool
 		)
 		for _, feature := range features {
 			switch feature {
 			case "database":
 				isFeatureDatabase = true
-			case "restore":
-				isFeatureRestore = true
+			case Clean:
+				isFeatureClean = true
 			}
 		}
 
@@ -179,9 +181,6 @@ func Adapter(
 				queryS,
 				operator.EnsureFuncToQueryFunc(ensureInit),
 			)
-		}
-
-		if isFeatureDatabase {
 			destroyers = append(destroyers,
 				destroyS,
 				operator.ResourceDestroyToZitadelDestroy(destroySFS),
@@ -191,6 +190,21 @@ func Adapter(
 			)
 		}
 
+		if isFeatureClean {
+			queriers = append(queriers,
+				operator.ResourceQueryToZitadelQuery(
+					statefulset.CleanPVCs(
+						monitor,
+						namespace,
+						cockroachSelectabel,
+						desiredKind.Spec.ReplicaCount,
+					),
+				),
+				operator.EnsureFuncToQueryFunc(ensureInit),
+				operator.EnsureFuncToQueryFunc(checkDBReady),
+			)
+		}
+
 		if desiredKind.Spec.Backups != nil {
 
 			oneBackup := false
@@ -215,6 +229,8 @@ func Adapter(
 						nodeselector,
 						tolerations,
 						version,
+						PublicServiceName,
+						cockroachPort,
 						features,
 						customImageRegistry,
 					)
@@ -233,21 +249,19 @@ func Adapter(
 		}
 
 		return func(k8sClient kubernetes.ClientInt, queried map[string]interface{}) (operator.EnsureFunc, error) {
-				if !isFeatureRestore {
-					queriedCurrentDB, err := core.ParseQueriedForDatabase(queried)
-					if err != nil || queriedCurrentDB == nil {
-						// TODO: query system state
-						currentDB.Current.Port = strconv.Itoa(int(cockroachPort))
-						currentDB.Current.URL = PublicServiceName
-						currentDB.Current.ReadyFunc = checkDBReady
-						currentDB.Current.AddUserFunc = addUser
-						currentDB.Current.DeleteUserFunc = deleteUser
-						currentDB.Current.ListUsersFunc = listUsers
-						currentDB.Current.ListDatabasesFunc = listDatabases
+				queriedCurrentDB, err := core.ParseQueriedForDatabase(queried)
+				if err != nil || queriedCurrentDB == nil {
+					// TODO: query system state
+					currentDB.Current.Port = strconv.Itoa(int(cockroachPort))
+					currentDB.Current.URL = PublicServiceName
+					currentDB.Current.ReadyFunc = checkDBReady
+					currentDB.Current.AddUserFunc = addUser
+					currentDB.Current.DeleteUserFunc = deleteUser
+					currentDB.Current.ListUsersFunc = listUsers
+					currentDB.Current.ListDatabasesFunc = listDatabases
 
-						core.SetQueriedForDatabase(queried, current)
-						internalMonitor.Info("set current state of managed database")
-					}
+					core.SetQueriedForDatabase(queried, current)
+					internalMonitor.Info("set current state of managed database")
 				}
 
 				ensure, err := operator.QueriersToEnsureFunc(internalMonitor, true, queriers, k8sClient, queried)