Skip to content

Commit 4f376ad

Browse files
authored
Set hostname based on resource type (#198)
1 parent e530116 commit 4f376ad

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

schedule.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ func NewCmdSchedule() *cobra.Command {
6262
case "Deployments", "Deployment", "deployments", "deployment":
6363
opt.AppKind = "Deployment"
6464
opt.SmartPrefix = ""
65+
opt.SnapshotHostname = opt.AppName
6566
_, err := kubeClient.AppsV1beta1().Deployments(opt.Namespace).Get(opt.AppName, metav1.GetOptions{})
6667
if err != nil {
6768
_, err := kubeClient.ExtensionsV1beta1().Deployments(opt.Namespace).Get(opt.AppName, metav1.GetOptions{})
@@ -72,27 +73,31 @@ func NewCmdSchedule() *cobra.Command {
7273
case "ReplicaSets", "ReplicaSet", "replicasets", "replicaset", "rs":
7374
opt.AppKind = "ReplicaSet"
7475
opt.SmartPrefix = ""
76+
opt.SnapshotHostname = opt.AppName
7577
_, err := kubeClient.ExtensionsV1beta1().ReplicaSets(opt.Namespace).Get(opt.AppName, metav1.GetOptions{})
7678
if err != nil {
7779
log.Fatalf(`Unknown ReplicaSet %s/%s`, opt.Namespace, opt.AppName)
7880
}
7981
case "ReplicationControllers", "ReplicationController", "replicationcontrollers", "replicationcontroller", "rc":
8082
opt.AppKind = "ReplicationController"
8183
opt.SmartPrefix = ""
84+
opt.SnapshotHostname = opt.AppName
8285
_, err := kubeClient.CoreV1().ReplicationControllers(opt.Namespace).Get(opt.AppName, metav1.GetOptions{})
8386
if err != nil {
8487
log.Fatalf(`Unknown ReplicationController %s/%s`, opt.Namespace, opt.AppName)
8588
}
8689
case "StatefulSets", "StatefulSet":
8790
opt.AppKind = "StatefulSet"
8891
opt.SmartPrefix = opt.PodName
92+
opt.SnapshotHostname = opt.PodName
8993
_, err := kubeClient.AppsV1beta1().StatefulSets(opt.Namespace).Get(opt.AppName, metav1.GetOptions{})
9094
if err != nil {
9195
log.Fatalf(`Unknown StatefulSet %s/%s`, opt.Namespace, opt.AppName)
9296
}
9397
case "DaemonSets", "DaemonSet", "daemonsets", "daemonset":
9498
opt.AppKind = "DaemonSet"
9599
opt.SmartPrefix = opt.NodeName
100+
opt.SnapshotHostname = opt.NodeName
96101
_, err := kubeClient.ExtensionsV1beta1().DaemonSets(opt.Namespace).Get(opt.AppName, metav1.GetOptions{})
97102
if err != nil {
98103
log.Fatalf(`Unknown DaemonSet %s/%s`, opt.Namespace, opt.AppName)

snapshot_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func ExportSnapshots(w http.ResponseWriter, r *http.Request) {
3535
http.Error(w, "Missing parameter:"+PathParamName, http.StatusBadRequest)
3636
return
3737
}
38-
resticCLI := cli.New(scratchDir)
38+
resticCLI := cli.New(scratchDir, "")
3939

4040
var resource *api.Restic
4141
resource, err := stashClient.Restics(namespace).Get(name, metav1.GetOptions{})

0 commit comments

Comments
 (0)