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

Merge pull request #8813 from rifelpet/tf-json-tags 

Fix terraform json field tags
This commit is contained in:
Kubernetes Prow Robot 2020-03-28 10:13:52 -07:00 committed by GitHub
parent 7698323377 5505de2c3c
commit f93ea91052
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/pkg/fi/cloudup/alitasks/launchconfiguration.go
View File

@ -302,7 +302,7 @@ func (_ *LaunchConfiguration) RenderALI(t *aliup.ALIAPITarget, a, e, changes *La
} }
type terraformLaunchConfiguration struct { type terraformLaunchConfiguration struct {
ImageID *string `json:"image_id ,omitempty"` ImageID *string `json:"image_id,omitempty"`
InstanceType *string `json:"instance_type,omitempty"` InstanceType *string `json:"instance_type,omitempty"`
SystemDiskCategory *string `json:"system_disk_category,omitempty"` SystemDiskCategory *string `json:"system_disk_category,omitempty"`
UserData *string `json:"user_data,omitempty"` UserData *string `json:"user_data,omitempty"`

4
upup/pkg/fi/cloudup/alitasks/securitygrouprule.go
View File

@ -185,8 +185,8 @@ type terraformSecurityGroupRole struct {
Type *string `json:"type,omitempty"` Type *string `json:"type,omitempty"`
IpProtocol *string `json:"ip_protocol,omitempty"` IpProtocol *string `json:"ip_protocol,omitempty"`
SourceCidrIp *string `json:"cidr_ip,omitempty"` SourceCidrIp *string `json:"cidr_ip,omitempty"`
SecurityGroupId *terraform.Literal `json:"security_group_id ,omitempty"` SecurityGroupId *terraform.Literal `json:"security_group_id,omitempty"`
SourceGroupId *terraform.Literal `json:"source_security_group_id ,omitempty"` SourceGroupId *terraform.Literal `json:"source_security_group_id,omitempty"`
PortRange *string `json:"port_range,omitempty"` PortRange *string `json:"port_range,omitempty"`
} }