Merge pull request #317 from sjberman/cherrypick-312

Merge pull request #312 from sjberman/class_annotation

Author: sjberman

docs/RELEASE-NOTES.rst

@@ -4,6 +4,13 @@ Release Notes for BIG-IP Controller for Kubernetes
 |release|
 ---------
 
+Bug Fixes
+`````````
+* - Fix SIGSEV on non-"f5" valued class annotation `[#311] <https://github.com/F5Networks/k8s-bigip-ctlr/issues/311>`_
+
+v1.1.0
+------
+
 Added Functionality
 ```````````````````
 

pkg/appmanager/appManager_test.go

@@ -3222,6 +3222,24 @@ func TestVirtualServerForIngress(t *testing.T) {
 	require.True(r, "Ingress resource should be processed")
 	require.Equal(0, resources.Count())
 
+	// Shouldn't process Ingress with non-F5 class
+	// https://github.com/F5Networks/k8s-bigip-ctlr/issues/311
+	ingressNotf5 := test.NewIngress("ingress-bad", "1", namespace, ingressConfig,
+		map[string]string{
+			"kubernetes.io/ingress.class": "notf5",
+		})
+	r = appMgr.addIngress(ingressNotf5)
+	require.False(r, "Ingress resource should not be processed.")
+	require.Equal(0, resources.Count())
+	ingressNotf5.Annotations["kubernetes.io/ingress.class"] = "f5"
+	r = appMgr.updateIngress(ingressNotf5)
+	require.True(r, "Ingress resource should be processed when flipping from notf5 to f5.")
+	require.Equal(1, resources.Count())
+	ingressNotf5.Annotations["kubernetes.io/ingress.class"] = "notf5again"
+	r = appMgr.updateIngress(ingressNotf5)
+	require.False(r, "Ingress resource should be destroyed when flipping from f5 to notf5again.")
+	require.Equal(0, resources.Count())
+
 	// Multi-service Ingress
 	ingressConfig = v1beta1.IngressSpec{
 		Rules: []v1beta1.IngressRule{

pkg/appmanager/validateResources.go

@@ -107,22 +107,23 @@ func (appMgr *Manager) checkValidIngress(
 		var keyList []*serviceQueueKey
 		rsCfg := createRSConfigFromIngress(ing, namespace,
 			appInf.svcInformer.GetIndexer(), portStruct)
-		rsName := rsCfg.Virtual.VirtualServerName
+		rsName := formatIngressVSName(ing, portStruct.protocol)
 		if rsCfg == nil {
 			if nil == ing.Spec.Rules { //single-service
 				serviceName := ing.Spec.Backend.ServiceName
 				servicePort := ing.Spec.Backend.ServicePort.IntVal
 				sKey := serviceKey{serviceName, servicePort, ing.ObjectMeta.Namespace}
 				if _, ok := appMgr.resources.Get(sKey, rsName); ok {
 					appMgr.resources.Delete(sKey, rsName)
+					appMgr.outputConfigLocked()
 				}
 			} else { //multi-service
 				_, keys := appMgr.resources.GetAllWithName(rsName)
 				for _, key := range keys {
 					appMgr.resources.Delete(key, rsName)
+					appMgr.outputConfigLocked()
 				}
 			}
-			appMgr.outputConfig()
 			return false, nil
 		}