need tagetName to delete snapshots now

api/v1alpha1/repo_types.go~

@@ -1,109 +0,0 @@
-/*
-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
-}

controllers/backupsession_controller_helper.go

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