Adding flag: drop tcp connections (#1564)

* Adding CloseConnectionsOnDelete flag

* Adding CloseConnectionsOnDelete to RouterMetadata

* Renamed new config to DropTcpConnections

Author: Karen-Schoener

api/types/client.go

@@ -76,6 +76,7 @@ type RouterOptions struct {
 	PodAnnotations      map[string]string
 	LoadBalancerIp      string
 	DisableMutualTLS    bool
+	DropTcpConnections  bool
 }
 
 type ControllerOptions struct {

pkg/qdr/qdr.go

@@ -70,6 +70,7 @@ func InitialConfig(id string, siteId string, version string, edge bool, helloAge
 func InitialConfigSkupperRouter(id string, siteId string, version string, edge bool, helloAge int, options types.RouterOptions) RouterConfig {
 	routerConfig := InitialConfig(id, siteId, version, edge, helloAge)
 	routerConfig.Metadata.DataConnectionCount = options.DataConnectionCount
+	routerConfig.Metadata.DropTcpConnections = options.DropTcpConnections
 
 	if options.Logging != nil {
 		ConfigureRouterLogging(&routerConfig, options.Logging)
@@ -417,6 +418,7 @@ type RouterMetadata struct {
 	Mode                Mode   `json:"mode,omitempty"`
 	HelloMaxAgeSeconds  string `json:"helloMaxAgeSeconds,omitempty"`
 	DataConnectionCount string `json:"dataConnectionCount,omitempty"`
+	DropTcpConnections  bool   `json:"dropTcpConnections,omitempty"`
 	Metadata            string `json:"metadata,omitempty"`
 }
 

pkg/site/site.go

@@ -73,6 +73,7 @@ const (
 	SiteConfigRouterPodAnnotationsKey      string = "router-pod-annotations"
 	SiteConfigRouterLoadBalancerIp         string = "router-load-balancer-ip"
 	SiteConfigRouterDisableMutualTLS       string = "router-disable-mutual-tls"
+	SiteConfigRouterDropTcpConnections     string = "router-drop-tcp-connections"
 
 	// controller options
 	SiteConfigServiceControllerKey            string = "service-controller"
@@ -269,6 +270,9 @@ func WriteSiteConfig(spec types.SiteConfigSpec, namespace string) (*corev1.Confi
 	if spec.Router.DisableMutualTLS {
 		siteConfig.Data[SiteConfigRouterDisableMutualTLS] = "true"
 	}
+	if spec.Router.DropTcpConnections {
+		siteConfig.Data[SiteConfigRouterDropTcpConnections] = "true"
+	}
 	if spec.Controller.Cpu != "" {
 		if _, err := resource.ParseQuantity(spec.Controller.Cpu); err != nil {
 			errs = append(errs, fmt.Sprintf("Invalid value for %s %q: %s", SiteConfigControllerCpuKey, spec.Controller.Cpu, err))
@@ -672,6 +676,9 @@ func ReadSiteConfig(siteConfig *corev1.ConfigMap, namespace string, defaultIngre
 	if value, ok := siteConfig.Data[SiteConfigRouterDisableMutualTLS]; ok {
 		result.Spec.Router.DisableMutualTLS, _ = strconv.ParseBool(value)
 	}
+	if value, ok := siteConfig.Data[SiteConfigRouterDropTcpConnections]; ok {
+		result.Spec.Router.DropTcpConnections, _ = strconv.ParseBool(value)
+	}
 
 	if controllerCpu, ok := siteConfig.Data[SiteConfigControllerCpuKey]; ok && controllerCpu != "" {
 		result.Spec.Controller.Cpu = controllerCpu