Merge pull request #830 from F5Networks/revert-816-vli-PR

Revert "http_redirect_irule_443 irule should honor custom http port"

Author: ssurenr

pkg/appmanager/resourceConfig.go

@@ -1576,9 +1576,6 @@ func (appMgr *Manager) createRSConfigFromIngress(
 	}
 	cfg.MetaData.ingName = ing.ObjectMeta.Name
 
-	sslRedirect := getBooleanAnnotation(ing.ObjectMeta.Annotations,
-		ingressSslRedirect, true)
-
 	resources.Lock()
 	defer resources.Unlock()
 	// Check to see if we already have any Ingresses for this IP:Port
@@ -1625,7 +1622,7 @@ func (appMgr *Manager) createRSConfigFromIngress(
 				}
 			}
 		} else if len(cfg.Policies) == 0 && plcy != nil {
-			cfg.IngSetPolicy(*plcy, sslRedirect, pStruct.protocol)
+			cfg.SetPolicy(*plcy)
 		}
 	} else { // This is a new VS for an Ingress
 		cfg.MetaData.ResourceType = "ingress"
@@ -1635,7 +1632,7 @@ func (appMgr *Manager) createRSConfigFromIngress(
 		cfg.Virtual.SetVirtualAddress(bindAddr, pStruct.port)
 		cfg.Pools = append(cfg.Pools, pools...)
 		if plcy != nil {
-			cfg.IngSetPolicy(*plcy, sslRedirect, pStruct.protocol)
+			cfg.SetPolicy(*plcy)
 		}
 	}
 
@@ -2215,36 +2212,6 @@ func (rc *ResourceConfig) SetPolicy(policy Policy) {
 	rc.Policies = append(rc.Policies, policy)
 }
 
-func (rc *ResourceConfig) IngSetPolicy(policy Policy, sslRedirect bool, pProtocol string) {
-	toFind := nameRef{
-		Name:      policy.Name,
-		Partition: policy.Partition,
-	}
-	found := false
-	for _, polName := range rc.Virtual.Policies {
-		if reflect.DeepEqual(toFind, polName) {
-			found = true
-			break
-		}
-	}
-	if !found {
-		if sslRedirect {
-			if pProtocol == "https" {
-				rc.Virtual.Policies = append(rc.Virtual.Policies, toFind)
-			}
-		} else {
-			rc.Virtual.Policies = append(rc.Virtual.Policies, toFind)
-		}
-	}
-	for i, pol := range rc.Policies {
-		if pol.Name == policy.Name && pol.Partition == policy.Partition {
-			rc.Policies[i] = policy
-			return
-		}
-	}
-	rc.Policies = append(rc.Policies, policy)
-}
-
 func (rc *ResourceConfig) RemovePolicy(policy Policy) {
 	toFind := nameRef{
 		Name:      policy.Name,

pkg/appmanager/routing.go

@@ -350,7 +350,7 @@ func httpRedirectIRule(port int32) string {
 	iRuleCode := fmt.Sprintf(`
 		when HTTP_REQUEST {
 			# Look for exact match for host name
-			set paths [class match -value [getfield [HTTP::host] ":" 1] equals https_redirect_dg]
+			set paths [class match -value [HTTP::host] equals https_redirect_dg]
 			if {$paths == ""} {
 				# See if there's an entry that matches all hosts
 				set paths [class match -value "*" equals https_redirect_dg]