Merge branch 'master' into cloudmap-1

Author: kiranmeduri

pkg/aws/appmesh.go

@@ -37,10 +37,6 @@ const (
 	ListRoutesTimeout             = 10
 	UpdateRouteTimeout            = 10
 	DeleteRouteTimeout            = 10
-	DefaultHealthyThreshold       = 10
-	DefaultIntervalMillis         = 30000
-	DefaultTimeoutMillis          = 5000
-	DefaultUnhealthyThreshold     = 2
 )
 
 type AppMeshAPI interface {
@@ -339,13 +335,13 @@ func (c *Cloud) CreateVirtualNode(ctx context.Context, vnode *appmeshv1beta1.Vir
 			}
 			if listener.HealthCheck != nil {
 				appmeshHealthCheck := &appmesh.HealthCheckPolicy{
-					HealthyThreshold:   defaultInt64(listener.HealthCheck.HealthyThreshold, DefaultHealthyThreshold),
-					IntervalMillis:     defaultInt64(listener.HealthCheck.IntervalMillis, DefaultIntervalMillis),
+					HealthyThreshold:   listener.HealthCheck.HealthyThreshold,
+					IntervalMillis:     listener.HealthCheck.IntervalMillis,
 					Path:               listener.HealthCheck.Path,
-					Port:               defaultInt64(listener.HealthCheck.Port, listener.PortMapping.Port),          //using listener's port
-					Protocol:           defaultString(listener.HealthCheck.Protocol, listener.PortMapping.Protocol), //using listener's protocol
-					TimeoutMillis:      defaultInt64(listener.HealthCheck.TimeoutMillis, DefaultTimeoutMillis),
-					UnhealthyThreshold: defaultInt64(listener.HealthCheck.UnhealthyThreshold, DefaultUnhealthyThreshold),
+					Port:               listener.HealthCheck.Port,
+					Protocol:           listener.HealthCheck.Protocol,
+					TimeoutMillis:      listener.HealthCheck.TimeoutMillis,
+					UnhealthyThreshold: listener.HealthCheck.UnhealthyThreshold,
 				}
 				appmeshListener.HealthCheck = appmeshHealthCheck
 			}
@@ -432,13 +428,13 @@ func (c *Cloud) UpdateVirtualNode(ctx context.Context, vnode *appmeshv1beta1.Vir
 			}
 			if listener.HealthCheck != nil {
 				appmeshHealthCheck := &appmesh.HealthCheckPolicy{
-					HealthyThreshold:   defaultInt64(listener.HealthCheck.HealthyThreshold, 10),
-					IntervalMillis:     defaultInt64(listener.HealthCheck.IntervalMillis, 30000),
+					HealthyThreshold:   listener.HealthCheck.HealthyThreshold,
+					IntervalMillis:     listener.HealthCheck.IntervalMillis,
 					Path:               listener.HealthCheck.Path,
 					Port:               listener.HealthCheck.Port,
-					Protocol:           defaultString(listener.HealthCheck.Protocol, appmeshv1beta1.PortProtocolHttp),
-					TimeoutMillis:      defaultInt64(listener.HealthCheck.TimeoutMillis, 5000),
-					UnhealthyThreshold: defaultInt64(listener.HealthCheck.UnhealthyThreshold, 2),
+					Protocol:           listener.HealthCheck.Protocol,
+					TimeoutMillis:      listener.HealthCheck.TimeoutMillis,
+					UnhealthyThreshold: listener.HealthCheck.UnhealthyThreshold,
 				}
 				appmeshListener.HealthCheck = appmeshHealthCheck
 			}
@@ -1459,20 +1455,6 @@ func (c *Cloud) buildGrpcRouteMetadata(input appmeshv1beta1.GrpcRouteMetadata) *
 	return appmeshMetadata
 }
 
-func defaultInt64(v *int64, defaultVal int64) *int64 {
-	if v != nil {
-		return v
-	}
-	return aws.Int64(defaultVal)
-}
-
-func defaultString(v *string, defaultVal string) *string {
-	if v != nil {
-		return v
-	}
-	return aws.String(defaultVal)
-}
-
 func durationToMillis(d *appmesh.Duration) *int64 {
 	if d == nil {
 		return nil

pkg/controller/virtualnode.go

@@ -23,6 +23,10 @@ import (
 const (
 	attributeKeyAppMeshMeshName        = "appmesh.k8s.aws/mesh"
 	attributeKeyAppMeshVirtualNodeName = "appmesh.k8s.aws/virtualNode"
+	defaultHealthyThreshold            = 10
+	defaultIntervalMillis              = 30000
+	defaultTimeoutMillis               = 5000
+	defaultUnhealthyThreshold          = 2
 )
 
 func (c *Controller) handleVNode(key string) error {
@@ -488,4 +492,33 @@ func (c *Controller) mutateVirtualNodeForProcessing(vnode *appmeshv1beta1.Virtua
 		vnode.Spec.ServiceDiscovery.CloudMap.Attributes[attributeKeyAppMeshMeshName] = vnode.Spec.MeshName
 		vnode.Spec.ServiceDiscovery.CloudMap.Attributes[attributeKeyAppMeshVirtualNodeName] = vnode.Name
 	}
+
+	if vnode.Spec.Listeners != nil {
+		for _, listener := range vnode.Spec.Listeners {
+			if listener.HealthCheck != nil {
+				//if port-mapping is not set for health-check we default it to listener's port-mapping
+				listener.HealthCheck.Port = defaultInt64(listener.HealthCheck.Port, listener.PortMapping.Port)
+				listener.HealthCheck.Protocol = defaultString(listener.HealthCheck.Protocol, listener.PortMapping.Protocol)
+				//below are some sane defaults for majority of applications
+				listener.HealthCheck.HealthyThreshold = defaultInt64(listener.HealthCheck.HealthyThreshold, defaultHealthyThreshold)
+				listener.HealthCheck.IntervalMillis = defaultInt64(listener.HealthCheck.IntervalMillis, defaultIntervalMillis)
+				listener.HealthCheck.TimeoutMillis = defaultInt64(listener.HealthCheck.TimeoutMillis, defaultTimeoutMillis)
+				listener.HealthCheck.UnhealthyThreshold = defaultInt64(listener.HealthCheck.UnhealthyThreshold, defaultUnhealthyThreshold)
+			}
+		}
+	}
+}
+
+func defaultInt64(v *int64, defaultVal int64) *int64 {
+	if v != nil {
+		return v
+	}
+	return awssdk.Int64(defaultVal)
+}
+
+func defaultString(v *string, defaultVal string) *string {
+	if v != nil {
+		return v
+	}
+	return awssdk.String(defaultVal)
 }

pkg/controller/virtualnode_test.go

@@ -739,6 +739,20 @@ func TestVNodeListenerHealthCheckNeedsUpdate(t *testing.T) {
 		backend                 = "bar.local"
 		fileAccessLogPath       = awssdk.String("/dev/stdout")
 
+		defaultSpecHealthCheck = &appmeshv1beta1.HealthCheckPolicy{
+			Path: awssdk.String("/"),
+		}
+
+		defaultResultHealthCheck = &appmesh.HealthCheckPolicy{
+			Path:               awssdk.String("/"),
+			Port:               awssdk.Int64(port80),
+			Protocol:           awssdk.String(protocolHTTP),
+			HealthyThreshold:   awssdk.Int64(defaultHealthyThreshold),
+			IntervalMillis:     awssdk.Int64(defaultIntervalMillis),
+			TimeoutMillis:      awssdk.Int64(defaultTimeoutMillis),
+			UnhealthyThreshold: awssdk.Int64(defaultUnhealthyThreshold),
+		}
+
 		specHealthCheck = &appmeshv1beta1.HealthCheckPolicy{
 			HealthyThreshold:   awssdk.Int64(1),
 			IntervalMillis:     awssdk.Int64(1000),
@@ -807,6 +821,7 @@ func TestVNodeListenerHealthCheckNeedsUpdate(t *testing.T) {
 		needsUpdate bool
 	}{
 		{"no health-check defined", nil, nil, false},
+		{"health-check are in sync with default", defaultSpecHealthCheck, defaultResultHealthCheck, false},
 		{"health-check are in sync", specHealthCheck, resultHealthCheck, false},
 		{"Path: target health-check is different", specHealthCheck, differentPathHealthCheck, true},
 		{"Protocol: target health-check is different", specHealthCheck, differentProtocolHealthCheck, true},
@@ -817,6 +832,11 @@ func TestVNodeListenerHealthCheckNeedsUpdate(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			spec := newAPIVirtualNode([]int64{port80}, []string{protocolHTTP}, []string{backend}, hostname, fileAccessLogPath)
 			spec.Spec.Listeners[0].HealthCheck = tt.desired
+			c := &Controller{}
+			spec.Namespace = "test-ns"
+			spec.Spec.MeshName = "test-mesh"
+			c.mutateVirtualNodeForProcessing(spec)
+
 			result := newAWSVirtualNode([]int64{port80}, []string{protocolHTTP}, []string{backend}, hostname, fileAccessLogPath)
 			result.Data.Spec.Listeners[0].HealthCheck = tt.target
 			if res := vnodeNeedsUpdate(spec, result); res != tt.needsUpdate {