mirror of https://github.com/kubernetes/kops.git
gofmt with go@1.10
This commit is contained in:
parent
2028841338
commit
b050cd7450
|
@ -58,13 +58,13 @@ func (m *MockAutoscaling) CreateAutoScalingGroup(input *autoscaling.CreateAutoSc
|
||||||
DefaultCooldown: input.DefaultCooldown,
|
DefaultCooldown: input.DefaultCooldown,
|
||||||
DesiredCapacity: input.DesiredCapacity,
|
DesiredCapacity: input.DesiredCapacity,
|
||||||
// EnabledMetrics: input.EnabledMetrics,
|
// EnabledMetrics: input.EnabledMetrics,
|
||||||
HealthCheckGracePeriod: input.HealthCheckGracePeriod,
|
HealthCheckGracePeriod: input.HealthCheckGracePeriod,
|
||||||
HealthCheckType: input.HealthCheckType,
|
HealthCheckType: input.HealthCheckType,
|
||||||
Instances: []*autoscaling.Instance{},
|
Instances: []*autoscaling.Instance{},
|
||||||
LaunchConfigurationName: input.LaunchConfigurationName,
|
LaunchConfigurationName: input.LaunchConfigurationName,
|
||||||
LoadBalancerNames: input.LoadBalancerNames,
|
LoadBalancerNames: input.LoadBalancerNames,
|
||||||
MaxSize: input.MaxSize,
|
MaxSize: input.MaxSize,
|
||||||
MinSize: input.MinSize,
|
MinSize: input.MinSize,
|
||||||
NewInstancesProtectedFromScaleIn: input.NewInstancesProtectedFromScaleIn,
|
NewInstancesProtectedFromScaleIn: input.NewInstancesProtectedFromScaleIn,
|
||||||
PlacementGroup: input.PlacementGroup,
|
PlacementGroup: input.PlacementGroup,
|
||||||
// Status: input.Status,
|
// Status: input.Status,
|
||||||
|
|
|
@ -98,7 +98,7 @@ func makeKubeconfig(ctx context.Context, config *Config, token string) ([]byte,
|
||||||
{
|
{
|
||||||
Name: clusterName,
|
Name: clusterName,
|
||||||
Cluster: v1.Cluster{
|
Cluster: v1.Cluster{
|
||||||
Server: config.KubeAPI,
|
Server: config.KubeAPI,
|
||||||
CertificateAuthorityData: content,
|
CertificateAuthorityData: content,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -581,7 +581,7 @@ func (b *KubeletBuilder) buildMasterKubeletKubeconfig() (*nodetasks.File, error)
|
||||||
|
|
||||||
template := &x509.Certificate{
|
template := &x509.Certificate{
|
||||||
BasicConstraintsValid: true,
|
BasicConstraintsValid: true,
|
||||||
IsCA: false,
|
IsCA: false,
|
||||||
}
|
}
|
||||||
|
|
||||||
template.Subject = pkix.Name{
|
template.Subject = pkix.Name{
|
||||||
|
|
|
@ -64,7 +64,7 @@ func Test_SharedGroups(t *testing.T) {
|
||||||
func makeTestInstanceGroupSec(role kops.InstanceGroupRole, secGroup *string) *kops.InstanceGroup {
|
func makeTestInstanceGroupSec(role kops.InstanceGroupRole, secGroup *string) *kops.InstanceGroup {
|
||||||
return &kops.InstanceGroup{
|
return &kops.InstanceGroup{
|
||||||
Spec: kops.InstanceGroupSpec{
|
Spec: kops.InstanceGroupSpec{
|
||||||
Role: role,
|
Role: role,
|
||||||
SecurityGroupOverride: secGroup,
|
SecurityGroupOverride: secGroup,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,7 +58,7 @@ func TestGenerateCertificate(t *testing.T) {
|
||||||
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
|
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
|
||||||
ExtKeyUsage: []x509.ExtKeyUsage{},
|
ExtKeyUsage: []x509.ExtKeyUsage{},
|
||||||
BasicConstraintsValid: true,
|
BasicConstraintsValid: true,
|
||||||
IsCA: true,
|
IsCA: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
cert, err := SignNewCertificate(key, template, nil, nil)
|
cert, err := SignNewCertificate(key, template, nil, nil)
|
||||||
|
|
|
@ -416,16 +416,16 @@ func (c *ApplyClusterCmd) Run() error {
|
||||||
"iamRolePolicy": &awstasks.IAMRolePolicy{},
|
"iamRolePolicy": &awstasks.IAMRolePolicy{},
|
||||||
|
|
||||||
// VPC / Networking
|
// VPC / Networking
|
||||||
"dhcpOptions": &awstasks.DHCPOptions{},
|
"dhcpOptions": &awstasks.DHCPOptions{},
|
||||||
"internetGateway": &awstasks.InternetGateway{},
|
"internetGateway": &awstasks.InternetGateway{},
|
||||||
"route": &awstasks.Route{},
|
"route": &awstasks.Route{},
|
||||||
"routeTable": &awstasks.RouteTable{},
|
"routeTable": &awstasks.RouteTable{},
|
||||||
"routeTableAssociation": &awstasks.RouteTableAssociation{},
|
"routeTableAssociation": &awstasks.RouteTableAssociation{},
|
||||||
"securityGroup": &awstasks.SecurityGroup{},
|
"securityGroup": &awstasks.SecurityGroup{},
|
||||||
"securityGroupRule": &awstasks.SecurityGroupRule{},
|
"securityGroupRule": &awstasks.SecurityGroupRule{},
|
||||||
"subnet": &awstasks.Subnet{},
|
"subnet": &awstasks.Subnet{},
|
||||||
"vpc": &awstasks.VPC{},
|
"vpc": &awstasks.VPC{},
|
||||||
"ngw": &awstasks.NatGateway{},
|
"ngw": &awstasks.NatGateway{},
|
||||||
"vpcDHDCPOptionsAssociation": &awstasks.VPCDHCPOptionsAssociation{},
|
"vpcDHDCPOptionsAssociation": &awstasks.VPCDHCPOptionsAssociation{},
|
||||||
|
|
||||||
// ELB
|
// ELB
|
||||||
|
|
|
@ -293,7 +293,7 @@ func buildCertificateTemplateForType(certificateType string) (*x509.Certificate,
|
||||||
|
|
||||||
template := &x509.Certificate{
|
template := &x509.Certificate{
|
||||||
BasicConstraintsValid: true,
|
BasicConstraintsValid: true,
|
||||||
IsCA: false,
|
IsCA: false,
|
||||||
}
|
}
|
||||||
|
|
||||||
tokens := strings.Split(certificateType, ",")
|
tokens := strings.Split(certificateType, ",")
|
||||||
|
|
|
@ -144,7 +144,7 @@ func BuildCAX509Template() *x509.Certificate {
|
||||||
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
|
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
|
||||||
ExtKeyUsage: []x509.ExtKeyUsage{},
|
ExtKeyUsage: []x509.ExtKeyUsage{},
|
||||||
BasicConstraintsValid: true,
|
BasicConstraintsValid: true,
|
||||||
IsCA: true,
|
IsCA: true,
|
||||||
}
|
}
|
||||||
return template
|
return template
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue