api/v1alpha1/backupconfiguration_types.go

@@ -57,8 +57,6 @@ type TargetContainer struct {
 	Steps []Step `json:"steps,omitempty"`
 	// +kubebuilder:default:=/formol-shared
 	SharePath string `json:"sharePath"`
-	// +optional
-	Job []Step `json:"job,omitempty"`
 }
 
 type Target struct {

api/v1alpha1/zz_generated.deepcopy.go

@@ -614,13 +614,6 @@ func (in *TargetContainer) DeepCopyInto(out *TargetContainer) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.Job != nil {
-		in, out := &in.Job, &out.Job
-		*out = make([]Step, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TargetContainer.

controllers/backupconfiguration_controller_helpers.go

@@ -130,36 +130,6 @@ func (r *BackupConfigurationReconciler) AddCronJob(backupConf formolv1alpha1.Bac
 	}
 }
 
-func (r *BackupConfigurationReconciler) getTargetObjects(kind formolv1alpha1.TargetKind, namespace string, name string) (targetObject client.Object, targetPodSpec *corev1.PodSpec, err error) {
-	switch kind {
-	case formolv1alpha1.Deployment:
-		deployment := appsv1.Deployment{}
-		if err = r.Get(r.Context, client.ObjectKey{
-			Namespace: namespace,
-			Name:      name,
-		}, &deployment); err != nil {
-			r.Log.Error(err, "cannot get deployment", "Deployment", name)
-			return
-		}
-		targetObject = &deployment
-		targetPodSpec = &deployment.Spec.Template.Spec
-
-	case formolv1alpha1.StatefulSet:
-		statefulSet := appsv1.StatefulSet{}
-		if err = r.Get(r.Context, client.ObjectKey{
-			Namespace: namespace,
-			Name:      name,
-		}, &statefulSet); err != nil {
-			r.Log.Error(err, "cannot get StatefulSet", "StatefulSet", name)
-			return
-		}
-		targetObject = &statefulSet
-		targetPodSpec = &statefulSet.Spec.Template.Spec
-
-	}
-	return
-}
-
 func (r *BackupConfigurationReconciler) DeleteSidecar(backupConf formolv1alpha1.BackupConfiguration) error {
 	removeTags := func(podSpec *corev1.PodSpec, target formolv1alpha1.Target) {
 		for i, container := range podSpec.Containers {
@@ -190,11 +160,34 @@ func (r *BackupConfigurationReconciler) DeleteSidecar(backupConf formolv1alpha1.
 	}
 	r.Log.V(1).Info("Got Repository", "repo", repo)
 	for _, target := range backupConf.Spec.Targets {
-		targetObject, targetPodSpec, err := r.getTargetObjects(target.TargetKind, backupConf.Namespace, target.TargetName)
-		if err != nil {
-			r.Log.Error(err, "unable to get target objects")
+		var targetObject client.Object
+		var targetPodSpec *corev1.PodSpec
+		switch target.TargetKind {
+		case formolv1alpha1.Deployment:
+			deployment := appsv1.Deployment{}
+			if err := r.Get(r.Context, client.ObjectKey{
+				Namespace: backupConf.Namespace,
+				Name:      target.TargetName,
+			}, &deployment); err != nil {
+				r.Log.Error(err, "cannot get deployment", "Deployment", target.TargetName)
 				return err
 			}
+			targetObject = &deployment
+			targetPodSpec = &deployment.Spec.Template.Spec
+
+		case formolv1alpha1.StatefulSet:
+			statefulSet := appsv1.StatefulSet{}
+			if err := r.Get(r.Context, client.ObjectKey{
+				Namespace: backupConf.Namespace,
+				Name:      target.TargetName,
+			}, &statefulSet); err != nil {
+				r.Log.Error(err, "cannot get deployment", "Deployment", target.TargetName)
+				return err
+			}
+			targetObject = &statefulSet
+			targetPodSpec = &statefulSet.Spec.Template.Spec
+
+		}
 		restoreContainers := []corev1.Container{}
 		for _, container := range targetPodSpec.Containers {
 			if container.Name == formolv1alpha1.SIDECARCONTAINER_NAME {
@@ -225,7 +218,7 @@ func (r *BackupConfigurationReconciler) DeleteSidecar(backupConf formolv1alpha1.
 		}
 		targetPodSpec.Volumes = restoreVolumes
 		removeTags(targetPodSpec, target)
-		if err = r.Update(r.Context, targetObject); err != nil {
+		if err := r.Update(r.Context, targetObject); err != nil {
 			r.Log.Error(err, "unable to remove sidecar", "targetObject", targetObject)
 			return err
 		}
@@ -272,14 +265,32 @@ func (r *BackupConfigurationReconciler) addSidecar(backupConf formolv1alpha1.Bac
 				},
 			}),
 		VolumeMounts: []corev1.VolumeMount{},
-		SecurityContext: &corev1.SecurityContext{
-			Privileged: func() *bool { b := true; return &b }(),
-		},
 	}
-	targetObject, targetPodSpec, err := r.getTargetObjects(target.TargetKind, backupConf.Namespace, target.TargetName)
-	if err != nil {
-		r.Log.Error(err, "unable to get target objects")
-		return err
+	var targetObject client.Object
+	var targetPodSpec *corev1.PodSpec
+	switch target.TargetKind {
+	case formolv1alpha1.Deployment:
+		deployment := appsv1.Deployment{}
+		if err = r.Get(r.Context, client.ObjectKey{
+			Namespace: backupConf.Namespace,
+			Name:      target.TargetName,
+		}, &deployment); err != nil {
+			r.Log.Error(err, "cannot get deployment", "Deployment", target.TargetName)
+			return
+		}
+		targetObject = &deployment
+		targetPodSpec = &deployment.Spec.Template.Spec
+	case formolv1alpha1.StatefulSet:
+		statefulSet := appsv1.StatefulSet{}
+		if err = r.Get(r.Context, client.ObjectKey{
+			Namespace: backupConf.Namespace,
+			Name:      target.TargetName,
+		}, &statefulSet); err != nil {
+			r.Log.Error(err, "cannot get deployment", "Deployment", target.TargetName)
+			return
+		}
+		targetObject = &statefulSet
+		targetPodSpec = &statefulSet.Spec.Template.Spec
 	}
 	if !hasSidecar(targetPodSpec) {
 		if err = r.createRBACSidecar(corev1.ServiceAccount{

test/00-setup.yaml

@@ -70,3 +70,106 @@ data:
   RESTIC_PASSWORD: bHIyOXhtOTU=
   AWS_ACCESS_KEY_ID: OWFTSXZBSEVzWlNVMmkyTU9zVGxWSk1lL1NjPQ==
   AWS_SECRET_ACCESS_KEY: WVN5ck9ncVllcjBWNFNLdlVOcmx2OGhjTllhZGZuN2xaNjBIaXRlL3djWT0=
+---
+apiVersion: formol.desmojim.fr/v1alpha1
+kind: Repo
+metadata:
+  name: repo-local
+  namespace: demo
+spec:
+  backend:
+    local:
+      emptyDir:
+  repositorySecrets: secret-minio
+---
+apiVersion: formol.desmojim.fr/v1alpha1
+kind: Repo
+metadata:
+  name: repo-minio
+  namespace: demo
+spec:
+  backend:
+    s3:
+      server: raid5.desmojim.fr:9000
+      bucket: testbucket2
+  repositorySecrets: secret-minio
+---
+apiVersion: formol.desmojim.fr/v1alpha1
+kind: Function
+metadata:
+  name: restore-pg
+  namespace: demo
+spec:
+  name: restore-pg
+  image: desmo999r/formolcli:latest
+  args: ["postgres", "restore", "--hostname", $(PGHOST), "--database", $(PGDATABASE), "--username", $(PGUSER), "--password", $(PGPASSWD), "--file", "/output/backup-pg.sql"]
+  env:
+    - name: PGHOST
+      value: postgres
+    - name: PGDATABASE
+      value: demopostgres
+    - name: PGUSER
+      value: demopostgres
+    - name: PGPASSWD
+      value: password123!
+---
+apiVersion: formol.desmojim.fr/v1alpha1
+kind: Function
+metadata:
+  name: with-envfrom
+  namespace: demo
+spec:
+  name: with-envfrom
+  command: ["touch", $(title)]
+  envFrom:
+    - secretRef:
+        name: with-envfrom-secret
+---
+apiVersion: formol.desmojim.fr/v1alpha1
+kind: Function
+metadata:
+  name: with-env
+  namespace: demo
+spec:
+  name: with-env
+  command: ["touch", $(TESTFILE)]
+  env:
+    - name: TESTFILE
+      value: /data/testfile
+---
+apiVersion: formol.desmojim.fr/v1alpha1
+kind: Function
+metadata:
+  name: backup-pg
+  namespace: demo
+spec:
+  name: backup-pg
+  image: desmo999r/formolcli:latest
+  args: ["postgres", "backup", "--hostname", $(PGHOST), "--database", $(PGDATABASE), "--username", $(PGUSER), "--password", $(PGPASSWD), "--file", "/output/backup-pg.sql"]
+  env:
+    - name: PGHOST
+      value: postgres
+    - name: PGDATABASE
+      value: demopostgres
+    - name: PGUSER
+      value: demopostgres
+    - name: PGPASSWD
+      value: password123!
+---
+apiVersion: formol.desmojim.fr/v1alpha1
+kind: Function
+metadata:
+  name: maintenance-off
+  namespace: demo
+spec:
+  name: maintenance-off
+  command: ["/bin/sh", "-c", "echo $(date +%Y/%m/%d-%H:%M:%S) maintenance-off >> /data/logs.txt"]
+---
+apiVersion: formol.desmojim.fr/v1alpha1
+kind: Function
+metadata:
+  name: maintenance-on
+  namespace: demo
+spec:
+  name: maintenance-on
+  command: ["/bin/sh", "-c", "echo $(date +%Y/%m/%d-%H:%M:%S) maintenance-on >> /data/logs.txt"]

test/01-deployment.yaml

@@ -84,11 +84,9 @@ spec:
               name: postgres-config-demo
         ports:
         - containerPort: 5432
-          name: postgresdb
+          name: postgredb
         volumeMounts:
-        - name: postgres-volume
+        - name: postgredb
           mountPath: /var/lib/postgresql/data
       volumes:
-      - name: postgres-volume
-        hostPath:
-          path: /data/postgresdb
+      - name: postgredb

test/02-backupconf.yaml

@@ -1,104 +1,5 @@
 ---
 apiVersion: formol.desmojim.fr/v1alpha1
-kind: Repo
-metadata:
-  name: repo-local
-  namespace: demo
-spec:
-  backend:
-    local:
-      emptyDir:
-  repositorySecrets: secret-minio
----
-apiVersion: formol.desmojim.fr/v1alpha1
-kind: Repo
-metadata:
-  name: repo-minio
-  namespace: demo
-spec:
-  backend:
-    s3:
-      server: raid5.desmojim.fr:9000
-      bucket: testbucket2
-  repositorySecrets: secret-minio
----
-apiVersion: formol.desmojim.fr/v1alpha1
-kind: Function
-metadata:
-  name: restore-pg
-  namespace: demo
-spec:
-  name: restore-pg
-  image: desmo999r/formolcli:latest
-  args: ["postgres", "restore", "--hostname", $(PGHOST), "--database", $(PGDATABASE), "--username", $(PGUSER), "--password", $(PGPASSWD), "--file", "/output/backup-pg.sql"]
-  env:
-    - name: PGHOST
-      value: postgres
-    - name: PGDATABASE
-      value: demopostgres
-    - name: PGUSER
-      value: demopostgres
-    - name: PGPASSWD
-      value: password123!
----
-apiVersion: formol.desmojim.fr/v1alpha1
-kind: Function
-metadata:
-  name: with-envfrom
-  namespace: demo
-spec:
-  name: with-envfrom
-  command: ["touch", $(title)]
-  envFrom:
-    - secretRef:
-        name: with-envfrom-secret
----
-apiVersion: formol.desmojim.fr/v1alpha1
-kind: Function
-metadata:
-  name: with-env
-  namespace: demo
-spec:
-  name: with-env
-  command: ["touch", $(TESTFILE)]
-  env:
-    - name: TESTFILE
-      value: /data/testfile
----
-apiVersion: formol.desmojim.fr/v1alpha1
-kind: Function
-metadata:
-  name: backup-pg
-  namespace: demo
-spec:
-  name: backup-pg
-  command: ["pg_dump"]
-  args: ["--username", $(PGUSER), "--clean", "--if-exists", "--inserts", "--file", "/formol-shared/backup-pg.sql"]
-  env:
-    - name: PGUSER
-      value: demopostgres
----
-apiVersion: formol.desmojim.fr/v1alpha1
-kind: Function
-metadata:
-  name: maintenance-off
-  namespace: demo
-spec:
-  name: maintenance-off
-  command: ["/bin/sh"]
-  args: ["-c", "echo $(date +%Y/%m/%d-%H:%M:%S) maintenance-off >> /data/logs.txt"]
----
-apiVersion: formol.desmojim.fr/v1alpha1
-kind: Function
-metadata:
-  name: maintenance-on
-  namespace: demo
-spec:
-  name: maintenance-on
-  command: ["/bin/sh"]
-  args: ["-c", "echo $(date +%Y/%m/%d-%H:%M:%S) maintenance-on >> /data/logs.txt"]
----
-apiVersion: formol.desmojim.fr/v1alpha1
 kind: BackupConfiguration
 metadata:
   name: backup-demo
@@ -131,8 +32,6 @@ spec:
     targetName: postgres-demo
     containers:
       - name: postgres
-        job:
-          - name: backup-pg
 #  - kind: Job
 #    name: backup-pg
 #    steps: