This commit is contained in:
Moustafa Baiou 2018-12-24 13:59:50 -05:00
parent 2028841338
commit b050cd7450
No known key found for this signature in database
GPG Key ID: 266E10C76A033B03
8 changed files with 23 additions and 23 deletions

View File

@ -58,13 +58,13 @@ func (m *MockAutoscaling) CreateAutoScalingGroup(input *autoscaling.CreateAutoSc
DefaultCooldown: input.DefaultCooldown,
DesiredCapacity: input.DesiredCapacity,
// EnabledMetrics: input.EnabledMetrics,
HealthCheckGracePeriod: input.HealthCheckGracePeriod,
HealthCheckType: input.HealthCheckType,
Instances: []*autoscaling.Instance{},
LaunchConfigurationName: input.LaunchConfigurationName,
LoadBalancerNames: input.LoadBalancerNames,
MaxSize: input.MaxSize,
MinSize: input.MinSize,
HealthCheckGracePeriod: input.HealthCheckGracePeriod,
HealthCheckType: input.HealthCheckType,
Instances: []*autoscaling.Instance{},
LaunchConfigurationName: input.LaunchConfigurationName,
LoadBalancerNames: input.LoadBalancerNames,
MaxSize: input.MaxSize,
MinSize: input.MinSize,
NewInstancesProtectedFromScaleIn: input.NewInstancesProtectedFromScaleIn,
PlacementGroup: input.PlacementGroup,
// Status: input.Status,

View File

@ -98,7 +98,7 @@ func makeKubeconfig(ctx context.Context, config *Config, token string) ([]byte,
{
Name: clusterName,
Cluster: v1.Cluster{
Server: config.KubeAPI,
Server: config.KubeAPI,
CertificateAuthorityData: content,
},
},

View File

@ -581,7 +581,7 @@ func (b *KubeletBuilder) buildMasterKubeletKubeconfig() (*nodetasks.File, error)
template := &x509.Certificate{
BasicConstraintsValid: true,
IsCA: false,
IsCA: false,
}
template.Subject = pkix.Name{

View File

@ -64,7 +64,7 @@ func Test_SharedGroups(t *testing.T) {
func makeTestInstanceGroupSec(role kops.InstanceGroupRole, secGroup *string) *kops.InstanceGroup {
return &kops.InstanceGroup{
Spec: kops.InstanceGroupSpec{
Role: role,
Role: role,
SecurityGroupOverride: secGroup,
},
}

View File

@ -58,7 +58,7 @@ func TestGenerateCertificate(t *testing.T) {
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
ExtKeyUsage: []x509.ExtKeyUsage{},
BasicConstraintsValid: true,
IsCA: true,
IsCA: true,
}
cert, err := SignNewCertificate(key, template, nil, nil)

View File

@ -416,16 +416,16 @@ func (c *ApplyClusterCmd) Run() error {
"iamRolePolicy": &awstasks.IAMRolePolicy{},
// VPC / Networking
"dhcpOptions": &awstasks.DHCPOptions{},
"internetGateway": &awstasks.InternetGateway{},
"route": &awstasks.Route{},
"routeTable": &awstasks.RouteTable{},
"routeTableAssociation": &awstasks.RouteTableAssociation{},
"securityGroup": &awstasks.SecurityGroup{},
"securityGroupRule": &awstasks.SecurityGroupRule{},
"subnet": &awstasks.Subnet{},
"vpc": &awstasks.VPC{},
"ngw": &awstasks.NatGateway{},
"dhcpOptions": &awstasks.DHCPOptions{},
"internetGateway": &awstasks.InternetGateway{},
"route": &awstasks.Route{},
"routeTable": &awstasks.RouteTable{},
"routeTableAssociation": &awstasks.RouteTableAssociation{},
"securityGroup": &awstasks.SecurityGroup{},
"securityGroupRule": &awstasks.SecurityGroupRule{},
"subnet": &awstasks.Subnet{},
"vpc": &awstasks.VPC{},
"ngw": &awstasks.NatGateway{},
"vpcDHDCPOptionsAssociation": &awstasks.VPCDHCPOptionsAssociation{},
// ELB

View File

@ -293,7 +293,7 @@ func buildCertificateTemplateForType(certificateType string) (*x509.Certificate,
template := &x509.Certificate{
BasicConstraintsValid: true,
IsCA: false,
IsCA: false,
}
tokens := strings.Split(certificateType, ",")

View File

@ -144,7 +144,7 @@ func BuildCAX509Template() *x509.Certificate {
KeyUsage: x509.KeyUsageCertSign | x509.KeyUsageCRLSign,
ExtKeyUsage: []x509.ExtKeyUsage{},
BasicConstraintsValid: true,
IsCA: true,
IsCA: true,
}
return template
}