api/v1alpha1/backupconfiguration_types.go

@@ -41,25 +41,17 @@ const (
 	JobKind      BackupType = "Job"
 )
 
-func GetTargetObjects(kind TargetKind) (targetObject client.Object, targetPodSpec *corev1.PodSpec, targetPodMeta *metav1.ObjectMeta) {
+func GetTargetObjects(kind TargetKind) (targetObject client.Object, targetPodSpec *corev1.PodSpec) {
 	switch kind {
 	case Deployment:
 		deployment := appsv1.Deployment{}
 		targetObject = &deployment
 		targetPodSpec = &deployment.Spec.Template.Spec
-		targetPodMeta = &deployment.Spec.Template.ObjectMeta
 
 	case StatefulSet:
 		statefulSet := appsv1.StatefulSet{}
 		targetObject = &statefulSet
 		targetPodSpec = &statefulSet.Spec.Template.Spec
-		targetPodMeta = &statefulSet.Spec.Template.ObjectMeta
-
-	case Pod:
-		pod := corev1.Pod{}
-		targetObject = &pod
-		targetPodSpec = &pod.Spec
-		targetPodMeta = &pod.ObjectMeta
 
 	}
 	return
@@ -68,7 +60,6 @@ func GetTargetObjects(kind TargetKind) (targetObject client.Object, targetPodSpe
 const (
 	BACKUP_PREFIX_PATH   = `backup`
 	FORMOL_SHARED_VOLUME = `formol-shared`
-	FORMOL_LABEL         = `formol-target`
 )
 
 type Step struct {

api/v1alpha1/repo_types.go~

@@ -0,0 +1,109 @@
+/*
+Copyright 2023.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"fmt"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"strings"
+)
+
+// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+type S3 struct {
+	Server string `json:"server"`
+	Bucket string `json:"bucket"`
+	// +optional
+	Prefix string `json:"prefix,omitempty"`
+}
+
+type Backend struct {
+	// +optional
+	S3 *S3 `json:"s3,omitempty"`
+	// +optional
+	Nfs *string `json:"nfs,omitempty"`
+}
+
+// RepoSpec defines the desired state of Repo
+type RepoSpec struct {
+	Backend           `json:"backend"`
+	RepositorySecrets string `json:"repositorySecrets"`
+}
+
+// RepoStatus defines the observed state of Repo
+type RepoStatus struct {
+}
+
+//+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
+
+// Repo is the Schema for the repoes API
+type Repo struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   RepoSpec   `json:"spec,omitempty"`
+	Status RepoStatus `json:"status,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// RepoList contains a list of Repo
+type RepoList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Repo `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&Repo{}, &RepoList{})
+}
+
+func (repo *Repo) GetResticEnv(backupConf BackupConfiguration) []corev1.EnvVar {
+	env := []corev1.EnvVar{}
+	if repo.Spec.Backend.S3 {
+		url := fmt.Sprintf("s3:http://%s/%s/%s-%s",
+			repo.Spec.Backend.S3.Server,
+			repo.Spec.Backend.S3.Bucket,
+			strings.ToUpper(backupConf.Namespace),
+			stringsToLower(backupConf.Name))
+		env = append(env, corev1.EnvVar{
+			Name:  "RESTIC_REPOSITORY",
+			Value: url,
+		})
+		for _, key := range []string{
+			"AWS_ACCESS_KEY_ID",
+			"AWS_SECRET_ACCESS_KEY",
+			"RESTIC_PASSWORD",
+		} {
+			env = append(env, corev1.EnvVar{
+				Name: key,
+				ValueFrom: &corev1.EnvVarSource{
+					SecretKeyRef: &corev1.SecretKeySelector{
+						LocalObjectReference: corev1.LocalObjectReference{
+							Name: repo.Spec.RepositorySecrets,
+						},
+						Key: key,
+					},
+				},
+			})
+		}
+	}
+
+	return env
+}

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: docker.io/desmo999r/formolcontroller
-  newTag: v1.0.2
+  newTag: v0.5.1

controllers/backupconfiguration_controller_helpers.go

@@ -162,7 +162,7 @@ func (r *BackupConfigurationReconciler) DeleteSidecar(backupConf formolv1alpha1.
 	}
 	r.Log.V(1).Info("Got Repository", "repo", repo)
 	for _, target := range backupConf.Spec.Targets {
-		targetObject, targetPodSpec, targetPodMeta := formolv1alpha1.GetTargetObjects(target.TargetKind)
+		targetObject, targetPodSpec := formolv1alpha1.GetTargetObjects(target.TargetKind)
 		if err := r.Get(r.Context, client.ObjectKey{
 			Namespace: backupConf.Namespace,
 			Name:      target.TargetName,
@@ -170,9 +170,6 @@ func (r *BackupConfigurationReconciler) DeleteSidecar(backupConf formolv1alpha1.
 			r.Log.Error(err, "cannot get target", "target", target.TargetName)
 			return err
 		}
-		if _, ok := targetPodMeta.Labels[formolv1alpha1.FORMOL_LABEL]; ok {
-			delete(targetPodMeta.Labels, formolv1alpha1.FORMOL_LABEL)
-		}
 		restoreContainers := []corev1.Container{}
 		for _, container := range targetPodSpec.Containers {
 			if container.Name == formolv1alpha1.SIDECARCONTAINER_NAME {
@@ -212,6 +209,15 @@ func (r *BackupConfigurationReconciler) DeleteSidecar(backupConf formolv1alpha1.
 	return nil
 }
 
+func hasSidecar(podSpec *corev1.PodSpec) bool {
+	for _, container := range podSpec.Containers {
+		if container.Name == formolv1alpha1.SIDECARCONTAINER_NAME {
+			return true
+		}
+	}
+	return false
+}
+
 func (r *BackupConfigurationReconciler) addSidecar(backupConf formolv1alpha1.BackupConfiguration, target formolv1alpha1.Target) (err error) {
 	repo := formolv1alpha1.Repo{}
 	if err = r.Get(r.Context, client.ObjectKey{
@@ -222,7 +228,8 @@ func (r *BackupConfigurationReconciler) addSidecar(backupConf formolv1alpha1.Bac
 		return err
 	}
 	r.Log.V(1).Info("Got Repository", "repo", repo)
-	targetObject, targetPodSpec, targetPodMeta := formolv1alpha1.GetTargetObjects(target.TargetKind)
+	sidecar := formolv1alpha1.GetSidecar(backupConf, target)
+	targetObject, targetPodSpec := formolv1alpha1.GetTargetObjects(target.TargetKind)
 	if err := r.Get(r.Context, client.ObjectKey{
 		Namespace: backupConf.Namespace,
 		Name:      target.TargetName,
@@ -230,29 +237,7 @@ func (r *BackupConfigurationReconciler) addSidecar(backupConf formolv1alpha1.Bac
 		r.Log.Error(err, "cannot get target", "target", target.TargetName)
 		return err
 	}
-	if _, ok := targetPodMeta.Labels[formolv1alpha1.FORMOL_LABEL]; !ok {
+	if !hasSidecar(targetPodSpec) {
-		targetPodMeta.Labels[formolv1alpha1.FORMOL_LABEL] = target.TargetName
-	}
-	hasSidecar := func(podSpec *corev1.PodSpec) int {
-		for i, container := range podSpec.Containers {
-			if container.Name == formolv1alpha1.SIDECARCONTAINER_NAME {
-				return i
-			}
-		}
-		return -1
-	}
-	if res := hasSidecar(targetPodSpec); res != -1 {
-		if targetPodSpec.Containers[res].Image != backupConf.Spec.Image {
-			r.Log.V(0).Info("New sidecar image. Updating pod", "old", targetPodSpec.Containers[res].Image, "new", backupConf.Spec.Image)
-			targetPodSpec.Containers[res].Image = backupConf.Spec.Image
-			if err = r.Update(r.Context, targetObject); err != nil {
-				r.Log.Error(err, "unable to update targetObject", "targetObject", targetObject)
-				return
-			}
-			return
-		}
-	} else {
-		sidecar := formolv1alpha1.GetSidecar(backupConf, target)
 		if err = r.createSidecarRBAC(targetPodSpec); err != nil {
 			r.Log.Error(err, "unable to create RBAC for the sidecar container")
 			return
@@ -465,7 +450,7 @@ func (r *BackupConfigurationReconciler) createSidecarRBAC(podSpec *corev1.PodSpe
 				rbacv1.PolicyRule{
 					Verbs:     []string{"get", "list", "watch"},
 					APIGroups: []string{""},
-					Resources: []string{"secrets", "configmaps", "persistentvolumes"},
+					Resources: []string{"secrets", "configmaps"},
 				},
 				rbacv1.PolicyRule{
 					Verbs:     []string{"get", "list", "watch", "create", "update", "patch", "delete"},

controllers/backupsession_controller_helper.go

@@ -113,14 +113,7 @@ func (r *BackupSessionReconciler) deleteSnapshots(backupSession formolv1alpha1.B
 			snapshots = append(snapshots, corev1.Container{
 				Name:  target.TargetName,
 				Image: backupConf.Spec.Image,
-				Args: []string{
+				Args:  []string{"snapshot", "delete", "--namespace", backupConf.Namespace, "--name", backupConf.Name, "--snapshot-id", target.SnapshotId},
-					"snapshot",
-					"delete",
-					"--namespace", backupConf.Namespace,
-					"--name", backupConf.Name,
-					"--target-name", target.TargetName,
-					"--snapshot-id", target.SnapshotId,
-				},
 			})
 		}
 	}