fix a few canary deployment issues (#943)

canaryconfigmgr/canaryConfigCache.go

@@ -22,6 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/fission/fission/cache"
+	"time"
 )
 
 type (
@@ -35,6 +36,11 @@ type (
 		Name      string
 		Namespace string
 	}
+
+	CanaryProcessingInfo struct {
+		CancelFunc *context.CancelFunc
+		Ticker     *time.Ticker
+	}
 )
 
 func makecanaryConfigCancelFuncMap() *canaryConfigCancelFuncMap {
@@ -50,19 +56,19 @@ func keyFromMetadata(m *metav1.ObjectMeta) metadataKey {
 	}
 }
 
-func (cancelFuncMap *canaryConfigCancelFuncMap) lookup(f *metav1.ObjectMeta) (*context.CancelFunc, error) {
+func (cancelFuncMap *canaryConfigCancelFuncMap) lookup(f *metav1.ObjectMeta) (*CanaryProcessingInfo, error) {
 	mk := keyFromMetadata(f)
 	item, err := cancelFuncMap.cache.Get(mk)
 	if err != nil {
 		return nil, err
 	}
-	cancelFunc := item.(*context.CancelFunc)
-	return cancelFunc, nil
+	value := item.(*CanaryProcessingInfo)
+	return value, nil
 }
 
-func (cancelFuncMap *canaryConfigCancelFuncMap) assign(f *metav1.ObjectMeta, cancelFunc *context.CancelFunc) error {
+func (cancelFuncMap *canaryConfigCancelFuncMap) assign(f *metav1.ObjectMeta, value *CanaryProcessingInfo) error {
 	mk := keyFromMetadata(f)
-	err, _ := cancelFuncMap.cache.Set(mk, cancelFunc)
+	err, _ := cancelFuncMap.cache.Set(mk, value)
 	return err
 }