From 86b605d10bb0fccd69e46c007006c45466746c67 Mon Sep 17 00:00:00 2001 From: binkkatal Date: Sun, 18 Oct 2020 11:22:33 +0530 Subject: [PATCH] RUN: ./hack/update-expected.sh --- .../complex/cloudformation.json | 20 +++++------ .../cloudformation.json | 8 ++--- .../cloudformation.json | 8 ++--- .../externallb/cloudformation.json | 8 ++--- .../launch_templates/cloudformation.json | 16 ++++----- .../cloudformation.json | 8 ++--- .../mixed_instances/cloudformation.json | 16 ++++----- .../mixed_instances_spot/cloudformation.json | 16 ++++----- .../privatecalico/cloudformation.json | 36 +++++++++---------- .../privatecilium/cloudformation.json | 36 +++++++++---------- .../privatecilium2/cloudformation.json | 36 +++++++++---------- .../privateciliumadvanced/cloudformation.json | 36 +++++++++---------- 12 files changed, 122 insertions(+), 122 deletions(-) diff --git a/tests/integration/update_cluster/complex/cloudformation.json b/tests/integration/update_cluster/complex/cloudformation.json index fbf0f4094b..4a0222fec0 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json +++ b/tests/integration/update_cluster/complex/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1acomplexexamplecom" @@ -96,8 +96,8 @@ ] } }, - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1acomplexexamplecom" @@ -1079,9 +1079,9 @@ "LoadBalancerName": "api-complex-example-com-vd3t5n", "Listeners": [ { - "InstancePort": 443, + "InstancePort": "443", "InstanceProtocol": "TCP", - "LoadBalancerPort": 443, + "LoadBalancerPort": "443", "Protocol": "TCP" } ], @@ -1099,10 +1099,10 @@ ], "HealthCheck": { "Target": "SSL:443", - "HealthyThreshold": 2, - "UnhealthyThreshold": 2, - "Interval": 10, - "Timeout": 5 + "HealthyThreshold": "2", + "UnhealthyThreshold": "2", + "Interval": "10", + "Timeout": "5" }, "ConnectionSettings": { "IdleTimeout": 300 diff --git a/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json b/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json index e53d37a51b..4b96388da6 100644 --- a/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/containerd-cloudformation/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1acontainerdexamplecom" @@ -81,8 +81,8 @@ ] } }, - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1acontainerdexamplecom" diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json index ab9f3887c8..52ca76bb0d 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aminimalexamplecom" @@ -81,8 +81,8 @@ ] } }, - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aminimalexamplecom" diff --git a/tests/integration/update_cluster/externallb/cloudformation.json b/tests/integration/update_cluster/externallb/cloudformation.json index 862cad6578..255db1d423 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json +++ b/tests/integration/update_cluster/externallb/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aexternallbexamplecom" @@ -87,8 +87,8 @@ ] } }, - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aexternallbexamplecom" diff --git a/tests/integration/update_cluster/launch_templates/cloudformation.json b/tests/integration/update_cluster/launch_templates/cloudformation.json index 70083b80f3..9f3d8ed155 100644 --- a/tests/integration/update_cluster/launch_templates/cloudformation.json +++ b/tests/integration/update_cluster/launch_templates/cloudformation.json @@ -7,8 +7,8 @@ "LaunchConfigurationName": { "Ref": "AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatesexamplecom" }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1alaunchtemplatesexamplecom" @@ -65,8 +65,8 @@ "LaunchConfigurationName": { "Ref": "AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatesexamplecom" }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1blaunchtemplatesexamplecom" @@ -123,8 +123,8 @@ "LaunchConfigurationName": { "Ref": "AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatesexamplecom" }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1claunchtemplatesexamplecom" @@ -181,8 +181,8 @@ "LaunchConfigurationName": { "Ref": "AWSAutoScalingLaunchConfigurationnodeslaunchtemplatesexamplecom" }, - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1blaunchtemplatesexamplecom" diff --git a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json index 826b827f50..b33bd0a5a0 100644 --- a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json +++ b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aminimalexamplecom" @@ -81,8 +81,8 @@ ] } }, - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aminimalexamplecom" diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json b/tests/integration/update_cluster/mixed_instances/cloudformation.json index 18ea84b147..e12f8f1c10 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1amixedinstancesexamplecom" @@ -81,8 +81,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1bmixedinstancesexamplecom" @@ -147,8 +147,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1cmixedinstancesexamplecom" @@ -202,8 +202,8 @@ "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { "AutoScalingGroupName": "nodes.mixedinstances.example.com", - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1bmixedinstancesexamplecom" diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json index 3c844342fe..3341c158bf 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1amixedinstancesexamplecom" @@ -81,8 +81,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1bmixedinstancesexamplecom" @@ -147,8 +147,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1cmixedinstancesexamplecom" @@ -202,8 +202,8 @@ "Type": "AWS::AutoScaling::AutoScalingGroup", "Properties": { "AutoScalingGroupName": "nodes.mixedinstances.example.com", - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1bmixedinstancesexamplecom" diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json b/tests/integration/update_cluster/privatecalico/cloudformation.json index 54c8fc3340..3677523f08 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetutilityustest1aprivatecalicoexamplecom" @@ -86,8 +86,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aprivatecalicoexamplecom" @@ -157,8 +157,8 @@ ] } }, - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aprivatecalicoexamplecom" @@ -1228,9 +1228,9 @@ "LoadBalancerName": "api-privatecalico-example-0uch4k", "Listeners": [ { - "InstancePort": 443, + "InstancePort": "443", "InstanceProtocol": "TCP", - "LoadBalancerPort": 443, + "LoadBalancerPort": "443", "Protocol": "TCP" } ], @@ -1246,10 +1246,10 @@ ], "HealthCheck": { "Target": "SSL:443", - "HealthyThreshold": 2, - "UnhealthyThreshold": 2, - "Interval": 10, - "Timeout": 5 + "HealthyThreshold": "2", + "UnhealthyThreshold": "2", + "Interval": "10", + "Timeout": "5" }, "ConnectionSettings": { "IdleTimeout": 300 @@ -1277,9 +1277,9 @@ "LoadBalancerName": "bastion-privatecalico-exa-hocohm", "Listeners": [ { - "InstancePort": 22, + "InstancePort": "22", "InstanceProtocol": "TCP", - "LoadBalancerPort": 22, + "LoadBalancerPort": "22", "Protocol": "TCP" } ], @@ -1295,10 +1295,10 @@ ], "HealthCheck": { "Target": "TCP:22", - "HealthyThreshold": 2, - "UnhealthyThreshold": 2, - "Interval": 10, - "Timeout": 5 + "HealthyThreshold": "2", + "UnhealthyThreshold": "2", + "Interval": "10", + "Timeout": "5" }, "ConnectionSettings": { "IdleTimeout": 300 diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json b/tests/integration/update_cluster/privatecilium/cloudformation.json index 1054792f20..1466d396bf 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetutilityustest1aprivateciliumexamplecom" @@ -86,8 +86,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aprivateciliumexamplecom" @@ -157,8 +157,8 @@ ] } }, - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aprivateciliumexamplecom" @@ -1214,9 +1214,9 @@ "LoadBalancerName": "api-privatecilium-example-fnt793", "Listeners": [ { - "InstancePort": 443, + "InstancePort": "443", "InstanceProtocol": "TCP", - "LoadBalancerPort": 443, + "LoadBalancerPort": "443", "Protocol": "TCP" } ], @@ -1232,10 +1232,10 @@ ], "HealthCheck": { "Target": "SSL:443", - "HealthyThreshold": 2, - "UnhealthyThreshold": 2, - "Interval": 10, - "Timeout": 5 + "HealthyThreshold": "2", + "UnhealthyThreshold": "2", + "Interval": "10", + "Timeout": "5" }, "ConnectionSettings": { "IdleTimeout": 300 @@ -1263,9 +1263,9 @@ "LoadBalancerName": "bastion-privatecilium-exa-l2ms01", "Listeners": [ { - "InstancePort": 22, + "InstancePort": "22", "InstanceProtocol": "TCP", - "LoadBalancerPort": 22, + "LoadBalancerPort": "22", "Protocol": "TCP" } ], @@ -1281,10 +1281,10 @@ ], "HealthCheck": { "Target": "TCP:22", - "HealthyThreshold": 2, - "UnhealthyThreshold": 2, - "Interval": 10, - "Timeout": 5 + "HealthyThreshold": "2", + "UnhealthyThreshold": "2", + "Interval": "10", + "Timeout": "5" }, "ConnectionSettings": { "IdleTimeout": 300 diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json b/tests/integration/update_cluster/privatecilium2/cloudformation.json index 1054792f20..1466d396bf 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetutilityustest1aprivateciliumexamplecom" @@ -86,8 +86,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aprivateciliumexamplecom" @@ -157,8 +157,8 @@ ] } }, - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aprivateciliumexamplecom" @@ -1214,9 +1214,9 @@ "LoadBalancerName": "api-privatecilium-example-fnt793", "Listeners": [ { - "InstancePort": 443, + "InstancePort": "443", "InstanceProtocol": "TCP", - "LoadBalancerPort": 443, + "LoadBalancerPort": "443", "Protocol": "TCP" } ], @@ -1232,10 +1232,10 @@ ], "HealthCheck": { "Target": "SSL:443", - "HealthyThreshold": 2, - "UnhealthyThreshold": 2, - "Interval": 10, - "Timeout": 5 + "HealthyThreshold": "2", + "UnhealthyThreshold": "2", + "Interval": "10", + "Timeout": "5" }, "ConnectionSettings": { "IdleTimeout": 300 @@ -1263,9 +1263,9 @@ "LoadBalancerName": "bastion-privatecilium-exa-l2ms01", "Listeners": [ { - "InstancePort": 22, + "InstancePort": "22", "InstanceProtocol": "TCP", - "LoadBalancerPort": 22, + "LoadBalancerPort": "22", "Protocol": "TCP" } ], @@ -1281,10 +1281,10 @@ ], "HealthCheck": { "Target": "TCP:22", - "HealthyThreshold": 2, - "UnhealthyThreshold": 2, - "Interval": 10, - "Timeout": 5 + "HealthyThreshold": "2", + "UnhealthyThreshold": "2", + "Interval": "10", + "Timeout": "5" }, "ConnectionSettings": { "IdleTimeout": 300 diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json index d06802b8ea..3a9dafa501 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json @@ -15,8 +15,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetutilityustest1aprivateciliumadvancedexamplecom" @@ -86,8 +86,8 @@ ] } }, - "MaxSize": 1, - "MinSize": 1, + "MaxSize": "1", + "MinSize": "1", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aprivateciliumadvancedexamplecom" @@ -157,8 +157,8 @@ ] } }, - "MaxSize": 2, - "MinSize": 2, + "MaxSize": "2", + "MinSize": "2", "VPCZoneIdentifier": [ { "Ref": "AWSEC2Subnetustest1aprivateciliumadvancedexamplecom" @@ -1245,9 +1245,9 @@ "LoadBalancerName": "api-privateciliumadvanced-0cffmm", "Listeners": [ { - "InstancePort": 443, + "InstancePort": "443", "InstanceProtocol": "TCP", - "LoadBalancerPort": 443, + "LoadBalancerPort": "443", "Protocol": "TCP" } ], @@ -1263,10 +1263,10 @@ ], "HealthCheck": { "Target": "SSL:443", - "HealthyThreshold": 2, - "UnhealthyThreshold": 2, - "Interval": 10, - "Timeout": 5 + "HealthyThreshold": "2", + "UnhealthyThreshold": "2", + "Interval": "10", + "Timeout": "5" }, "ConnectionSettings": { "IdleTimeout": 300 @@ -1294,9 +1294,9 @@ "LoadBalancerName": "bastion-privateciliumadva-0jni40", "Listeners": [ { - "InstancePort": 22, + "InstancePort": "22", "InstanceProtocol": "TCP", - "LoadBalancerPort": 22, + "LoadBalancerPort": "22", "Protocol": "TCP" } ], @@ -1312,10 +1312,10 @@ ], "HealthCheck": { "Target": "TCP:22", - "HealthyThreshold": 2, - "UnhealthyThreshold": 2, - "Interval": 10, - "Timeout": 5 + "HealthyThreshold": "2", + "UnhealthyThreshold": "2", + "Interval": "10", + "Timeout": "5" }, "ConnectionSettings": { "IdleTimeout": 300