kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add back "omitempty" to cloudformation SubnetMapping

This commit is contained in:
Alexander Block 2021-02-10 18:02:13 +01:00
parent cc4aca62f4
commit 684ff3498e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/update_cluster/complex/cloudformation.json
View File

@ -1253,9 +1253,7 @@
{ {
"SubnetId": { "SubnetId": {
"Ref": "AWSEC2Subnetustest1acomplexexamplecom" "Ref": "AWSEC2Subnetustest1acomplexexamplecom"
}, }
"AllocationId": null,
"PrivateIPv4Address": null
} }
], ],
"Type": "network", "Type": "network",

4
upup/pkg/fi/cloudup/awstasks/network_load_balancer.go
View File

@ -813,8 +813,8 @@ type cloudformationNetworkLoadBalancer struct {
type cloudformationSubnetMapping struct { type cloudformationSubnetMapping struct {
Subnet *cloudformation.Literal `json:"SubnetId"` Subnet *cloudformation.Literal `json:"SubnetId"`
AllocationId *string `json:"AllocationId"` AllocationId *string `json:"AllocationId,omitempty"`
PrivateIPv4Address *string `json:"PrivateIPv4Address"` PrivateIPv4Address *string `json:"PrivateIPv4Address,omitempty"`
} }
type cloudformationNetworkLoadBalancerListener struct { type cloudformationNetworkLoadBalancerListener struct {