Update workload controller for new design

apis/constants.go

@@ -15,8 +15,11 @@ const (
 	Hostname = "HOSTNAME"
 
 	TargetName        = "TARGET_NAME"
-	TargetDirectories = "TARGET_DIRECTORIES"
+	TargetAPIVersion  = "TARGET_API_VERSION"
+	TargetKind        = "TARGET_KIND"
+	TargetNamespace   = "TARGET_NAMESPACE"
 	TargetMountPath   = "TARGET_MOUNT_PATH"
+	TargetDirectories = "TARGET_DIRECTORIES"
 
 	RestoreDirectories = "RESTORE_DIRECTORIES"
 	RestoreSnapshots   = "RESTORE_SNAPSHOTS"

apis/stash/v1alpha1/restic_helpers.go

@@ -1,11 +1,21 @@
 package v1alpha1
 
 import (
+	"hash/fnv"
+	"strconv"
+
 	"github.com/appscode/stash/apis"
 	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	hashutil "k8s.io/kubernetes/pkg/util/hash"
 	crdutils "kmodules.xyz/client-go/apiextensions/v1beta1"
 )
 
+func (r Restic) GetSpecHash() string {
+	hash := fnv.New64a()
+	hashutil.DeepHashObject(hash, r.Spec)
+	return strconv.FormatUint(hash.Sum64(), 10)
+}
+
 func (c Restic) CustomResourceDefinition() *apiextensions.CustomResourceDefinition {
 	return crdutils.NewCustomResourceDefinition(crdutils.Config{
 		Group:         SchemeGroupVersion.Group,

apis/stash/v1alpha1/workload.go

@@ -3,14 +3,8 @@ package v1alpha1
 import (
 	"fmt"
 	"strings"
-)
 
-const (
-	KindDeployment            = "Deployment"
-	KindReplicaSet            = "ReplicaSet"
-	KindReplicationController = "ReplicationController"
-	KindStatefulSet           = "StatefulSet"
-	KindDaemonSet             = "DaemonSet"
+	"github.com/appscode/stash/apis"
 )
 
 // LocalTypedReference contains enough information to let you inspect or modify the referred object.
@@ -34,15 +28,15 @@ func (workload *LocalTypedReference) Canonicalize() error {
 	}
 	switch strings.ToLower(workload.Kind) {
 	case "deployments", "deployment", "deploy":
-		workload.Kind = KindDeployment
+		workload.Kind = apis.KindDeployment
 	case "replicasets", "replicaset", "rs":
-		workload.Kind = KindReplicaSet
+		workload.Kind = apis.KindReplicaSet
 	case "replicationcontrollers", "replicationcontroller", "rc":
-		workload.Kind = KindReplicationController
+		workload.Kind = apis.KindReplicationController
 	case "statefulsets", "statefulset":
-		workload.Kind = KindStatefulSet
+		workload.Kind = apis.KindStatefulSet
 	case "daemonsets", "daemonset", "ds":
-		workload.Kind = KindDaemonSet
+		workload.Kind = apis.KindDaemonSet
 	default:
 		return fmt.Errorf(`unrecognized workload "Kind" %v`, workload.Kind)
 	}
@@ -52,11 +46,11 @@ func (workload *LocalTypedReference) Canonicalize() error {
 func (workload LocalTypedReference) GetRepositoryCRDName(podName, nodeName string) string {
 	name := ""
 	switch workload.Kind {
-	case KindDeployment, KindReplicaSet, KindReplicationController:
+	case apis.KindDeployment, apis.KindReplicaSet, apis.KindReplicationController:
 		name = strings.ToLower(workload.Kind) + "." + workload.Name
-	case KindStatefulSet:
+	case apis.KindStatefulSet:
 		name = strings.ToLower(workload.Kind) + "." + podName
-	case KindDaemonSet:
+	case apis.KindDaemonSet:
 		name = strings.ToLower(workload.Kind) + "." + workload.Name + "." + nodeName
 	}
 	return name
@@ -71,16 +65,16 @@ func (workload LocalTypedReference) HostnamePrefix(podName, nodeName string) (ho
 		return "", "", fmt.Errorf("missing workload name or kind")
 	}
 	switch workload.Kind {
-	case KindDeployment, KindReplicaSet, KindReplicationController:
+	case apis.KindDeployment, apis.KindReplicaSet, apis.KindReplicationController:
 		return workload.Name, strings.ToLower(workload.Kind) + "/" + workload.Name, nil
-	case KindStatefulSet:
+	case apis.KindStatefulSet:
 		if podName == "" {
-			return "", "", fmt.Errorf("missing podName for %s", KindStatefulSet)
+			return "", "", fmt.Errorf("missing podName for %s", apis.KindStatefulSet)
 		}
 		return podName, strings.ToLower(workload.Kind) + "/" + podName, nil
-	case KindDaemonSet:
+	case apis.KindDaemonSet:
 		if nodeName == "" {
-			return "", "", fmt.Errorf("missing nodeName for %s", KindDaemonSet)
+			return "", "", fmt.Errorf("missing nodeName for %s", apis.KindDaemonSet)
 		}
 		return nodeName, strings.ToLower(workload.Kind) + "/" + workload.Name + "/" + nodeName, nil
 	default:

apis/stash/v1beta1/annotations.go

@@ -1,10 +1,23 @@
 package v1beta1
 
 const (
-	BackupKey                = "backup.appscode.com"
-	LastAppliedConfiguration = BackupKey + "/last-applied-configuration"
-	VersionTag               = BackupKey + "/tag"
+	VersionTag = BackupKey + "/tag"
 	// ResourceVersion will be used to trigger restarts for ReplicaSet and RC pods
-	ResourceHash = BackupKey + "/resource-hash"
-	StashKey     = "stash.appscode.com"
+	StashKey                       = "stash.appscode.com"
+	BackupKey                      = "backup.appscode.com"
+	RestoreKey                     = "restore.appscode.com"
+	SuffixLastAppliedConfiguration = "/last-applied-configuration"
+	SuffixResourceHash             = "/resource-hash"
+
+	KeyBackupConfigurationTemplate = StashKey + "/backup-template"
+	KeyTargetDirectories           = StashKey + "/target-directories"
+	KeyMountPath                   = StashKey + "/mountpath"
+	KeyVolumeMounts                = StashKey + "/volume-mounts"
+
+	KeyLastAppliedRestoreSession      = RestoreKey + SuffixLastAppliedConfiguration
+	KeyLastAppliedBackupConfiguration = BackupKey + SuffixLastAppliedConfiguration
+
+	AppliedBackupConfigurationSpecHash = BackupKey + SuffixResourceHash
+	AppliedRestoreSessionSpecHash      = RestoreKey + SuffixResourceHash
+	ResourceHash                       = BackupKey + SuffixResourceHash
 )