stashed · tamalsaha · Nov 11, 2017 · Oct 16, 2017 · Oct 17, 2017 · Oct 17, 2017
diff --git a/chart/stable/stash/templates/cluster-role.yaml b/chart/stable/stash/templates/cluster-role.yaml
@@ -41,6 +41,10 @@ rules:
   - namespaces
   - replicationcontrollers
   verbs: ["get", "list", "watch", "patch"]
+- apiGroups: [""]
+  resources:
+  - configmaps
+  verbs: ["delete"]
 - apiGroups: [""]
   resources:
   - secrets

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -22,8 +22,6 @@ import:
 - package: github.com/onsi/gomega
   version: v1.2.0
 - package: github.com/pkg/errors
-- package: github.com/prometheus/client_golang
-  version: v0.8.0
 - package: github.com/spf13/cobra
   version: master
 - package: github.com/spf13/pflag
@@ -37,13 +35,24 @@ import:
   vcs: git
   version: v2
 - package: k8s.io/api
-  version: fe29995db37613b9c5b2a647544cf627bfa8d299
-- package: k8s.io/apiextensions-apiserver
   version: release-1.8
 - package: k8s.io/apimachinery
-  version: 019ae5ada31de202164b118aee88ee2d14075c31
+  version: release-1.8
 - package: k8s.io/client-go
-  version: v5.0.0
-testImport:
+  version: kubernetes-1.8.3-beta.0
+- package: k8s.io/apiextensions-apiserver
+  version: release-1.8
+- package: k8s.io/kubernetes
+  repo: https://github.com/appscode/kubernetes.git
+  version: v1.8.3
+  vcs: git
+- package: github.com/prometheus/client_golang
+  version: v0.8.0
+- package: github.com/prometheus/common
+  version: 3233b24a36715a2fe36d162260457857a56d672d
+- package: github.com/sirupsen/logrus
+  version: v1.0.3
+- package: github.com/docker/distribution
+  version: edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c
 - package: github.com/onsi/ginkgo
   version: v1.4.0
diff --git a/hack/deploy/with-rbac.yaml b/hack/deploy/with-rbac.yaml
@@ -37,6 +37,10 @@ rules:
   - namespaces
   - replicationcontrollers
   verbs: ["get", "list", "watch", "patch"]
+- apiGroups: [""]
+  resources:
+  - configmaps
+  verbs: ["delete"]
 - apiGroups: [""]
   resources:
   - secrets
@@ -177,6 +181,10 @@ rules:
   - replicationcontrollers
   - secrets
   verbs: ["get"]
+- apiGroups: [""]
+  resources:
+  - configmaps
+  verbs: ["create", "update", "get"]
 - apiGroups: [""]
   resources:
   - events

diff --git a/pkg/cmds/schedule.go b/pkg/cmds/schedule.go
@@ -1,13 +1,13 @@
 package cmds
 
 import (
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
 
 	"github.com/appscode/go/log"
 	"github.com/appscode/kutil"
+	api "github.com/appscode/stash/apis/stash/v1alpha1"
 	cs "github.com/appscode/stash/client/typed/stash/v1alpha1"
 	"github.com/appscode/stash/pkg/scheduler"
 	"github.com/appscode/stash/pkg/util"
@@ -58,28 +58,22 @@ func NewCmdSchedule() *cobra.Command {
 			if opt.SnapshotHostname, opt.SmartPrefix, err = opt.Workload.HostnamePrefix(opt.PodName, opt.NodeName); err != nil {
 				log.Fatalf(err.Error())
 			}
-			if err = util.CheckWorkloadExists(kubeClient, opt.Namespace, opt.Workload); err != nil {
+			if err = util.WorkloadExists(kubeClient, opt.Namespace, opt.Workload); err != nil {
 				log.Fatalf(err.Error())
 			}
-
-			opt.ScratchDir = strings.TrimSuffix(opt.ScratchDir, "/")
-			err = os.MkdirAll(opt.ScratchDir, 0755)
-			if err != nil {
-				log.Fatalf("Failed to create scratch dir: %s", err)
-			}
-			err = ioutil.WriteFile(opt.ScratchDir+"/.stash", []byte("test"), 644)
-			if err != nil {
-				log.Fatalf("No write access in scratch dir: %s", err)
-			}
+			opt.ScratchDir = strings.TrimSuffix(opt.ScratchDir, "/") // setup ScratchDir in SetupAndRun
 
 			ctrl := scheduler.New(kubeClient, stashClient, opt)
-			err = ctrl.Setup()
-			if err != nil {
-				log.Fatalf("Failed to setup scheduler: %s", err)
+			stopBackup := make(chan struct{})
+			defer close(stopBackup)
+
+			// split code from here for leader election
+			switch opt.Workload.Kind {
+			case api.AppKindDeployment, api.AppKindReplicaSet, api.AppKindReplicationController:
+				ctrl.ElectLeader(stopBackup)
+			default:
+				ctrl.SetupAndRun(stopBackup)
 			}
-			stop := make(chan struct{})
-			defer close(stop)
-			go ctrl.Run(1, stop)
 
 			// Wait forever
 			select {}

diff --git a/pkg/controller/deployment.go b/pkg/controller/deployment.go
@@ -121,6 +121,12 @@ func (c *StashController) runDeploymentInjector(key string) error {
 	if !exists {
 		// Below we will warm up our cache with a Deployment, so that we will see a delete for one d
 		fmt.Printf("Deployment %s does not exist anymore\n", key)
+
+		ns, name, err := cache.SplitMetaNamespaceKey(key)
+		if err != nil {
+			return err
+		}
+		util.DeleteConfigmapLock(c.k8sClient, ns, api.LocalTypedReference{Kind: api.AppKindDeployment, Name: name})
 	} else {
 		dp := obj.(*apps.Deployment)
 		fmt.Printf("Sync/Add/Update for Deployment %s\n", dp.GetName())
@@ -233,5 +239,9 @@ func (c *StashController) EnsureDeploymentSidecarDeleted(resource *apps.Deployme
 		return
 	}
 	err = util.WaitUntilSidecarRemoved(c.k8sClient, resource.Namespace, resource.Spec.Selector)
+	if err != nil {
+		return
+	}
+	util.DeleteConfigmapLock(c.k8sClient, resource.Namespace, api.LocalTypedReference{Kind: api.AppKindDeployment, Name: resource.Name})
 	return err
 }
diff --git a/pkg/controller/rcs.go b/pkg/controller/rcs.go
@@ -119,6 +119,12 @@ func (c *StashController) runRCInjector(key string) error {
 	if !exists {
 		// Below we will warm up our cache with a ReplicationController, so that we will see a delete for one d
 		fmt.Printf("ReplicationController %s does not exist anymore\n", key)
+
+		ns, name, err := cache.SplitMetaNamespaceKey(key)
+		if err != nil {
+			return err
+		}
+		util.DeleteConfigmapLock(c.k8sClient, ns, api.LocalTypedReference{Kind: api.AppKindReplicationController, Name: name})
 	} else {
 		rc := obj.(*core.ReplicationController)
 		fmt.Printf("Sync/Add/Update for ReplicationController %s\n", rc.GetName())
@@ -231,5 +237,9 @@ func (c *StashController) EnsureReplicationControllerSidecarDeleted(resource *co
 		return
 	}
 	err = util.WaitUntilSidecarRemoved(c.k8sClient, resource.Namespace, &metav1.LabelSelector{MatchLabels: resource.Spec.Selector})
+	if err != nil {
+		return
+	}
+	util.DeleteConfigmapLock(c.k8sClient, resource.Namespace, api.LocalTypedReference{Kind: api.AppKindReplicationController, Name: resource.Name})
 	return err
 }
diff --git a/pkg/controller/replicasets.go b/pkg/controller/replicasets.go
@@ -121,6 +121,12 @@ func (c *StashController) runReplicaSetInjector(key string) error {
 	if !exists {
 		// Below we will warm up our cache with a ReplicaSet, so that we will see a delete for one d
 		fmt.Printf("ReplicaSet %s does not exist anymore\n", key)
+
+		ns, name, err := cache.SplitMetaNamespaceKey(key)
+		if err != nil {
+			return err
+		}
+		util.DeleteConfigmapLock(c.k8sClient, ns, api.LocalTypedReference{Kind: api.AppKindReplicaSet, Name: name})
 	} else {
 		rs := obj.(*extensions.ReplicaSet)
 		fmt.Printf("Sync/Add/Update for ReplicaSet %s\n", rs.GetName())
@@ -238,5 +244,9 @@ func (c *StashController) EnsureReplicaSetSidecarDeleted(resource *extensions.Re
 		return
 	}
 	err = util.WaitUntilSidecarRemoved(c.k8sClient, resource.Namespace, resource.Spec.Selector)
-	return err
+	if err != nil {
+		return
+	}
+	util.DeleteConfigmapLock(c.k8sClient, resource.Namespace, api.LocalTypedReference{Kind: api.AppKindReplicaSet, Name: resource.Name})
+	return
 }