Merge pull request #856 from trinaths/as3-dev

Branch out the CC implementation for AS3 Specific implementation.

Author: ssurenr

pkg/appmanager/appManager.go

@@ -405,6 +405,8 @@ func (appMgr *Manager) GetNamespaceLabelInformer() cache.SharedIndexInformer {
 type serviceQueueKey struct {
 	Namespace   string
 	ServiceName string
+	As3Name     string // as3 Specific configMap name
+	As3Data     string // if As3Name is present, populate this with as3 tmpl data
 }
 
 type appInformer struct {
@@ -764,6 +766,13 @@ func (appMgr *Manager) virtualServerWorker() {
 
 func (appMgr *Manager) processNextVirtualServer() bool {
 	key, quit := appMgr.vsQueue.Get()
+	k := key.(serviceQueueKey)
+	if len(k.As3Name) != 0 {
+		log.Debugf("[as3_log] Processing AS3 cfgMap (%s) with AS3 Manager.\n", k.As3Name)
+		log.Debugf("[as3_log] AS3 ConfigMap Data: %s\n", k.As3Data)
+		appMgr.vsQueue.Done(key)
+		return false
+	}
 	if !appMgr.initialState && appMgr.processedItems == 0 {
 		//TODO: Properly handlle queueLen assessment and remove Sleep function
 		time.Sleep(1 * time.Second)
@@ -916,6 +925,14 @@ func (appMgr *Manager) syncConfigMaps(
 		if cm.ObjectMeta.Namespace != sKey.Namespace {
 			continue
 		}
+		// If as3 just continue
+		if val, ok := cm.ObjectMeta.Labels["as3"]; ok {
+			if as3Val, err := strconv.ParseBool(val); err == nil {
+				if as3Val {
+					continue
+				}
+			}
+		}
 
 		rsCfg, err := parseConfigMap(cm, appMgr.schemaLocal, appMgr.vsSnatPoolName)
 		if nil != err {

pkg/appmanager/appManager_test.go

@@ -4068,6 +4068,16 @@ var _ = Describe("AppManager Tests", func() {
 				Expect(events[0].Reason).To(Equal("DNSResolutionError"))
 				Expect(events[1].Reason).To(Equal("ResourceConfigured"))
 			})
+			// Test Case to check AS3 specific branching out.
+			It("ConfigMap with AS3 true flag", func() {
+				cfgFoo := test.NewConfigMap("foomap", "1", namespace, map[string]string{
+					"data": configmapFoo})
+				cfgFoo.ObjectMeta.Labels = make(map[string]string)
+				cfgFoo.ObjectMeta.Labels["as3"] = "true"
+				ok, keyList := mockMgr.appMgr.checkValidConfigMap(cfgFoo)
+				Expect(ok).To(BeTrue(), "ConfigMap with AS3 TRUE be processed.")
+				Expect(keyList[:1][0].As3Name).To(Equal("foomap"))
+			})
 		})
 
 		Context("namespace related", func() {

pkg/appmanager/validateResources.go

@@ -29,13 +29,26 @@ func (appMgr *Manager) checkValidConfigMap(
 ) (bool, []*serviceQueueKey) {
 	// Identify the specific service being referenced, and return it if it's
 	// one we care about.
+	var keyList []*serviceQueueKey
 	cm := obj.(*v1.ConfigMap)
 	namespace := cm.ObjectMeta.Namespace
 	_, ok := appMgr.getNamespaceInformer(namespace)
 	if !ok {
 		// Not watching this namespace
 		return false, nil
 	}
+	//check as3 config map.
+	// if ok, add cfgMap name and data to serviceQueueKey.
+	if ok := appMgr.checkAs3ConfigMap(obj); ok {
+		log.Debugf("[as3_log] Found AS3 ConfigMap - %s.", cm.ObjectMeta.Name)
+		key := &serviceQueueKey{
+			Namespace: namespace,
+			As3Name:   cm.ObjectMeta.Name,
+			As3Data:   cm.Data["template"],
+		}
+		keyList = append(keyList, key)
+		return true, keyList
+	}
 	cfg, err := parseConfigMap(cm, appMgr.schemaLocal, appMgr.vsSnatPoolName)
 	if nil != err {
 		if handleConfigMapParseFailure(appMgr, cm, cfg, err) {
@@ -62,7 +75,6 @@ func (appMgr *Manager) checkValidConfigMap(
 		ServiceName: cfg.Pools[0].ServiceName,
 		Namespace:   namespace,
 	}
-	var keyList []*serviceQueueKey
 	keyList = append(keyList, key)
 	return true, keyList
 }
@@ -363,3 +375,23 @@ func validateAppRootAnnotations(rsType int, entries map[string]string) {
 		}
 	}
 }
+
+// name:       checkAs3ConfigMap
+// arguments:  obj interface{} - ConfigMap Object
+// return val: bool - is it AS3 or not
+// description: This function validates configmap be AS3 specific or not
+
+func (appMgr *Manager) checkAs3ConfigMap(
+	obj interface{},
+) bool {
+	// check for metadata.labels has 'as3' and that 'as3' is set to 'true'
+	cm := obj.(*v1.ConfigMap)
+	labels := cm.ObjectMeta.Labels
+	if val, ok := labels["as3"]; ok {
+		log.Debugf("[as3_log] Found AS3 config map...")
+		if val == "true" {
+			return true
+		}
+	}
+	return false
+}