mirror of https://github.com/kubernetes/kops.git
				
				
				
			aws: Set the target group health check interval to 10s
This commit is contained in:
		
							parent
							
								
									228a573ba5
								
							
						
					
					
						commit
						1d53eba4b3
					
				|  | @ -278,6 +278,7 @@ func (b *APILoadBalancerBuilder) Build(c *fi.ModelBuilderContext) error { | ||||||
| 				Tags:               tcpGroupTags, | 				Tags:               tcpGroupTags, | ||||||
| 				Protocol:           fi.String("TCP"), | 				Protocol:           fi.String("TCP"), | ||||||
| 				Port:               fi.Int64(443), | 				Port:               fi.Int64(443), | ||||||
|  | 				Interval:           fi.Int64(10), | ||||||
| 				HealthyThreshold:   fi.Int64(2), | 				HealthyThreshold:   fi.Int64(2), | ||||||
| 				UnhealthyThreshold: fi.Int64(2), | 				UnhealthyThreshold: fi.Int64(2), | ||||||
| 				Shared:             fi.Bool(false), | 				Shared:             fi.Bool(false), | ||||||
|  | @ -300,6 +301,7 @@ func (b *APILoadBalancerBuilder) Build(c *fi.ModelBuilderContext) error { | ||||||
| 					Tags:               tlsGroupTags, | 					Tags:               tlsGroupTags, | ||||||
| 					Protocol:           fi.String("TLS"), | 					Protocol:           fi.String("TLS"), | ||||||
| 					Port:               fi.Int64(443), | 					Port:               fi.Int64(443), | ||||||
|  | 					Interval:           fi.Int64(10), | ||||||
| 					HealthyThreshold:   fi.Int64(2), | 					HealthyThreshold:   fi.Int64(2), | ||||||
| 					UnhealthyThreshold: fi.Int64(2), | 					UnhealthyThreshold: fi.Int64(2), | ||||||
| 					Shared:             fi.Bool(false), | 					Shared:             fi.Bool(false), | ||||||
|  |  | ||||||
|  | @ -45,6 +45,7 @@ type TargetGroup struct { | ||||||
| 	// Shared is set if this is an external LB (one we don't create or own)
 | 	// Shared is set if this is an external LB (one we don't create or own)
 | ||||||
| 	Shared *bool | 	Shared *bool | ||||||
| 
 | 
 | ||||||
|  | 	Interval           *int64 | ||||||
| 	HealthyThreshold   *int64 | 	HealthyThreshold   *int64 | ||||||
| 	UnhealthyThreshold *int64 | 	UnhealthyThreshold *int64 | ||||||
| } | } | ||||||
|  | @ -88,10 +89,14 @@ func (e *TargetGroup) Find(c *fi.Context) (*TargetGroup, error) { | ||||||
| 		Port:               tg.Port, | 		Port:               tg.Port, | ||||||
| 		Protocol:           tg.Protocol, | 		Protocol:           tg.Protocol, | ||||||
| 		ARN:                tg.TargetGroupArn, | 		ARN:                tg.TargetGroupArn, | ||||||
|  | 		Interval:           tg.HealthCheckIntervalSeconds, | ||||||
| 		HealthyThreshold:   tg.HealthyThresholdCount, | 		HealthyThreshold:   tg.HealthyThresholdCount, | ||||||
| 		UnhealthyThreshold: tg.UnhealthyThresholdCount, | 		UnhealthyThreshold: tg.UnhealthyThresholdCount, | ||||||
| 		VPC:                &VPC{ID: tg.VpcId}, | 		VPC:                &VPC{ID: tg.VpcId}, | ||||||
| 	} | 	} | ||||||
|  | 	// Interval cannot be changed after TargetGroup creation
 | ||||||
|  | 	e.Interval = actual.Interval | ||||||
|  | 
 | ||||||
| 	e.ARN = tg.TargetGroupArn | 	e.ARN = tg.TargetGroupArn | ||||||
| 
 | 
 | ||||||
| 	tagsResp, err := cloud.ELBV2().DescribeTags(&elbv2.DescribeTagsInput{ | 	tagsResp, err := cloud.ELBV2().DescribeTags(&elbv2.DescribeTagsInput{ | ||||||
|  | @ -215,6 +220,7 @@ type terraformTargetGroup struct { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| type terraformTargetGroupHealthCheck struct { | type terraformTargetGroupHealthCheck struct { | ||||||
|  | 	Interval           int64  `cty:"interval"` | ||||||
| 	HealthyThreshold   int64  `cty:"healthy_threshold"` | 	HealthyThreshold   int64  `cty:"healthy_threshold"` | ||||||
| 	UnhealthyThreshold int64  `cty:"unhealthy_threshold"` | 	UnhealthyThreshold int64  `cty:"unhealthy_threshold"` | ||||||
| 	Protocol           string `cty:"protocol"` | 	Protocol           string `cty:"protocol"` | ||||||
|  | @ -237,6 +243,7 @@ func (_ *TargetGroup) RenderTerraform(t *terraform.TerraformTarget, a, e, change | ||||||
| 		VPCID:    *e.VPC.TerraformLink(), | 		VPCID:    *e.VPC.TerraformLink(), | ||||||
| 		Tags:     e.Tags, | 		Tags:     e.Tags, | ||||||
| 		HealthCheck: terraformTargetGroupHealthCheck{ | 		HealthCheck: terraformTargetGroupHealthCheck{ | ||||||
|  | 			Interval:           *e.Interval, | ||||||
| 			HealthyThreshold:   *e.HealthyThreshold, | 			HealthyThreshold:   *e.HealthyThreshold, | ||||||
| 			UnhealthyThreshold: *e.UnhealthyThreshold, | 			UnhealthyThreshold: *e.UnhealthyThreshold, | ||||||
| 			Protocol:           elbv2.ProtocolEnumTcp, | 			Protocol:           elbv2.ProtocolEnumTcp, | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue