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

Merge pull request #9802 from rifelpet/api-slice-pointers 

Update API slice fields to not use pointers
This commit is contained in:
Kubernetes Prow Robot 2020-08-24 07:13:41 -07:00 committed by GitHub
parent 83d299dafc 7d9f0a06cf
commit 255e48a414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 158 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/kops-api-example/up.go
View File

@ -52,11 +52,11 @@ func up(ctx context.Context) error {
} }
for _, etcdClusterName := range cloudup.EtcdClusters { for _, etcdClusterName := range cloudup.EtcdClusters {
etcdCluster := &api.EtcdClusterSpec{ etcdCluster := api.EtcdClusterSpec{
Name: etcdClusterName, Name: etcdClusterName,
} }
for _, masterZone := range masterZones { for _, masterZone := range masterZones {
etcdMember := &api.EtcdMemberSpec{ etcdMember := api.EtcdMemberSpec{
Name: masterZone, Name: masterZone,
InstanceGroup: fi.String(masterZone), InstanceGroup: fi.String(masterZone),
} }

6
pkg/apis/kops/cluster.go
View File

@ -143,7 +143,7 @@ type ClusterSpec struct {
// A collection of files assets for deployed cluster wide // A collection of files assets for deployed cluster wide
FileAssets []FileAssetSpec `json:"fileAssets,omitempty"` FileAssets []FileAssetSpec `json:"fileAssets,omitempty"`
// EtcdClusters stores the configuration for each cluster // EtcdClusters stores the configuration for each cluster
EtcdClusters []*EtcdClusterSpec `json:"etcdClusters,omitempty"` EtcdClusters []EtcdClusterSpec `json:"etcdClusters,omitempty"`
// Component configurations // Component configurations
Containerd *ContainerdConfig `json:"containerd,omitempty"` Containerd *ContainerdConfig `json:"containerd,omitempty"`
Docker *DockerConfig `json:"docker,omitempty"` Docker *DockerConfig `json:"docker,omitempty"`
@ -204,7 +204,7 @@ type NodeAuthorizerSpec struct {
// Authorizer is the authorizer to use // Authorizer is the authorizer to use
Authorizer string `json:"authorizer,omitempty"` Authorizer string `json:"authorizer,omitempty"`
// Features is a series of authorizer features to enable or disable // Features is a series of authorizer features to enable or disable
Features *[]string `json:"features,omitempty"` Features []string `json:"features,omitempty"`
// Image is the location of container // Image is the location of container
Image string `json:"image,omitempty"` Image string `json:"image,omitempty"`
// NodeURL is the node authorization service url // NodeURL is the node authorization service url
@ -443,7 +443,7 @@ type EtcdClusterSpec struct {
// We default to manager for kubernetes 1.11 or if the manager is configured; otherwise standalone. // We default to manager for kubernetes 1.11 or if the manager is configured; otherwise standalone.
Provider EtcdProviderType `json:"provider,omitempty"` Provider EtcdProviderType `json:"provider,omitempty"`
// Members stores the configurations for each member of the cluster (including the data volume) // Members stores the configurations for each member of the cluster (including the data volume)
Members []*EtcdMemberSpec `json:"etcdMembers,omitempty"` Members []EtcdMemberSpec `json:"etcdMembers,omitempty"`
// EnableEtcdTLS indicates the etcd service should use TLS between peers and clients // EnableEtcdTLS indicates the etcd service should use TLS between peers and clients
EnableEtcdTLS bool `json:"enableEtcdTLS,omitempty"` EnableEtcdTLS bool `json:"enableEtcdTLS,omitempty"`
// EnableTLSAuth indicates client and peer TLS auth should be enforced // EnableTLSAuth indicates client and peer TLS auth should be enforced

4
pkg/apis/kops/instancegroup.go
View File

@ -109,9 +109,9 @@ type InstanceGroupSpec struct {
// RootVolumeEncryption enables EBS root volume encryption for an instance // RootVolumeEncryption enables EBS root volume encryption for an instance
RootVolumeEncryption *bool `json:"rootVolumeEncryption,omitempty"` RootVolumeEncryption *bool `json:"rootVolumeEncryption,omitempty"`
// Volumes is a collection of additional volumes to create for instances within this InstanceGroup // Volumes is a collection of additional volumes to create for instances within this InstanceGroup
Volumes []*VolumeSpec `json:"volumes,omitempty"` Volumes []VolumeSpec `json:"volumes,omitempty"`
// VolumeMounts a collection of volume mounts // VolumeMounts a collection of volume mounts
VolumeMounts []*VolumeMountSpec `json:"volumeMounts,omitempty"` VolumeMounts []VolumeMountSpec `json:"volumeMounts,omitempty"`
// Subnets is the names of the Subnets (as specified in the Cluster) where machines in this instance group should be placed // Subnets is the names of the Subnets (as specified in the Cluster) where machines in this instance group should be placed
Subnets []string `json:"subnets,omitempty"` Subnets []string `json:"subnets,omitempty"`
// Zones is the names of the Zones where machines in this instance group should be placed // Zones is the names of the Zones where machines in this instance group should be placed

6
pkg/apis/kops/v1alpha2/cluster.go
View File

@ -142,7 +142,7 @@ type ClusterSpec struct {
// A collection of files assets for deployed cluster wide // A collection of files assets for deployed cluster wide
FileAssets []FileAssetSpec `json:"fileAssets,omitempty"` FileAssets []FileAssetSpec `json:"fileAssets,omitempty"`
// EtcdClusters stores the configuration for each cluster // EtcdClusters stores the configuration for each cluster
EtcdClusters []*EtcdClusterSpec `json:"etcdClusters,omitempty"` EtcdClusters []EtcdClusterSpec `json:"etcdClusters,omitempty"`
// Component configurations // Component configurations
Containerd *ContainerdConfig `json:"containerd,omitempty"` Containerd *ContainerdConfig `json:"containerd,omitempty"`
Docker *DockerConfig `json:"docker,omitempty"` Docker *DockerConfig `json:"docker,omitempty"`
@ -202,7 +202,7 @@ type NodeAuthorizerSpec struct {
// Authorizer is the authorizer to use // Authorizer is the authorizer to use
Authorizer string `json:"authorizer,omitempty"` Authorizer string `json:"authorizer,omitempty"`
// Features is a series of authorizer features to enable or disable // Features is a series of authorizer features to enable or disable
Features *[]string `json:"features,omitempty"` Features []string `json:"features,omitempty"`
// Image is the location of container // Image is the location of container
Image string `json:"image,omitempty"` Image string `json:"image,omitempty"`
// NodeURL is the node authorization service url // NodeURL is the node authorization service url
@ -439,7 +439,7 @@ type EtcdClusterSpec struct {
// We default to manager for kubernetes 1.11 or if the manager is configured; otherwise standalone. // We default to manager for kubernetes 1.11 or if the manager is configured; otherwise standalone.
Provider EtcdProviderType `json:"provider,omitempty"` Provider EtcdProviderType `json:"provider,omitempty"`
// Members stores the configurations for each member of the cluster (including the data volume) // Members stores the configurations for each member of the cluster (including the data volume)
Members []*EtcdMemberSpec `json:"etcdMembers,omitempty"` Members []EtcdMemberSpec `json:"etcdMembers,omitempty"`
// EnableEtcdTLS indicates the etcd service should use TLS between peers and clients // EnableEtcdTLS indicates the etcd service should use TLS between peers and clients
EnableEtcdTLS bool `json:"enableEtcdTLS,omitempty"` EnableEtcdTLS bool `json:"enableEtcdTLS,omitempty"`
// EnableTLSAuth indicates client and peer TLS auth should be enforced // EnableTLSAuth indicates client and peer TLS auth should be enforced

4
pkg/apis/kops/v1alpha2/instancegroup.go
View File

@ -106,9 +106,9 @@ type InstanceGroupSpec struct {
// RootVolumeEncryption enables EBS root volume encryption for an instance // RootVolumeEncryption enables EBS root volume encryption for an instance
RootVolumeEncryption *bool `json:"rootVolumeEncryption,omitempty"` RootVolumeEncryption *bool `json:"rootVolumeEncryption,omitempty"`
// Volumes is a collection of additional volumes to create for instances within this InstanceGroup // Volumes is a collection of additional volumes to create for instances within this InstanceGroup
Volumes []*VolumeSpec `json:"volumes,omitempty"` Volumes []VolumeSpec `json:"volumes,omitempty"`
// VolumeMounts a collection of volume mounts // VolumeMounts a collection of volume mounts
VolumeMounts []*VolumeMountSpec `json:"volumeMounts,omitempty"` VolumeMounts []VolumeMountSpec `json:"volumeMounts,omitempty"`
// Subnets is the names of the Subnets (as specified in the Cluster) where machines in this instance group should be placed // Subnets is the names of the Subnets (as specified in the Cluster) where machines in this instance group should be placed
Subnets []string `json:"subnets,omitempty"` Subnets []string `json:"subnets,omitempty"`
// Zones is the names of the Zones where machines in this instance group should be placed // Zones is the names of the Zones where machines in this instance group should be placed

40
pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View File

@ -1872,10 +1872,9 @@ func autoConvert_v1alpha2_ClusterSpec_To_kops_ClusterSpec(in *ClusterSpec, out *
} }
if in.EtcdClusters != nil { if in.EtcdClusters != nil {
in, out := &in.EtcdClusters, &out.EtcdClusters in, out := &in.EtcdClusters, &out.EtcdClusters
*out = make([]*kops.EtcdClusterSpec, len(*in)) *out = make([]kops.EtcdClusterSpec, len(*in))
for i := range *in { for i := range *in {
// TODO: Inefficient conversion - can we improve it? if err := Convert_v1alpha2_EtcdClusterSpec_To_kops_EtcdClusterSpec(&(*in)[i], &(*out)[i], s); err != nil {
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
return err return err
} }
} }
@ -2195,10 +2194,9 @@ func autoConvert_kops_ClusterSpec_To_v1alpha2_ClusterSpec(in *kops.ClusterSpec,
} }
if in.EtcdClusters != nil { if in.EtcdClusters != nil {
in, out := &in.EtcdClusters, &out.EtcdClusters in, out := &in.EtcdClusters, &out.EtcdClusters
*out = make([]*EtcdClusterSpec, len(*in)) *out = make([]EtcdClusterSpec, len(*in))
for i := range *in { for i := range *in {
// TODO: Inefficient conversion - can we improve it? if err := Convert_kops_EtcdClusterSpec_To_v1alpha2_EtcdClusterSpec(&(*in)[i], &(*out)[i], s); err != nil {
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
return err return err
} }
} }
@ -2713,10 +2711,9 @@ func autoConvert_v1alpha2_EtcdClusterSpec_To_kops_EtcdClusterSpec(in *EtcdCluste
out.Provider = kops.EtcdProviderType(in.Provider) out.Provider = kops.EtcdProviderType(in.Provider)
if in.Members != nil { if in.Members != nil {
in, out := &in.Members, &out.Members in, out := &in.Members, &out.Members
*out = make([]*kops.EtcdMemberSpec, len(*in)) *out = make([]kops.EtcdMemberSpec, len(*in))
for i := range *in { for i := range *in {
// TODO: Inefficient conversion - can we improve it? if err := Convert_v1alpha2_EtcdMemberSpec_To_kops_EtcdMemberSpec(&(*in)[i], &(*out)[i], s); err != nil {
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
return err return err
} }
} }
@ -2762,10 +2759,9 @@ func autoConvert_kops_EtcdClusterSpec_To_v1alpha2_EtcdClusterSpec(in *kops.EtcdC
out.Provider = EtcdProviderType(in.Provider) out.Provider = EtcdProviderType(in.Provider)
if in.Members != nil { if in.Members != nil {
in, out := &in.Members, &out.Members in, out := &in.Members, &out.Members
*out = make([]*EtcdMemberSpec, len(*in)) *out = make([]EtcdMemberSpec, len(*in))
for i := range *in { for i := range *in {
// TODO: Inefficient conversion - can we improve it? if err := Convert_kops_EtcdMemberSpec_To_v1alpha2_EtcdMemberSpec(&(*in)[i], &(*out)[i], s); err != nil {
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
return err return err
} }
} }
@ -3310,10 +3306,9 @@ func autoConvert_v1alpha2_InstanceGroupSpec_To_kops_InstanceGroupSpec(in *Instan
out.RootVolumeEncryption = in.RootVolumeEncryption out.RootVolumeEncryption = in.RootVolumeEncryption
if in.Volumes != nil { if in.Volumes != nil {
in, out := &in.Volumes, &out.Volumes in, out := &in.Volumes, &out.Volumes
*out = make([]*kops.VolumeSpec, len(*in)) *out = make([]kops.VolumeSpec, len(*in))
for i := range *in { for i := range *in {
// TODO: Inefficient conversion - can we improve it? if err := Convert_v1alpha2_VolumeSpec_To_kops_VolumeSpec(&(*in)[i], &(*out)[i], s); err != nil {
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
return err return err
} }
} }
@ -3322,10 +3317,9 @@ func autoConvert_v1alpha2_InstanceGroupSpec_To_kops_InstanceGroupSpec(in *Instan
} }
if in.VolumeMounts != nil { if in.VolumeMounts != nil {
in, out := &in.VolumeMounts, &out.VolumeMounts in, out := &in.VolumeMounts, &out.VolumeMounts
*out = make([]*kops.VolumeMountSpec, len(*in)) *out = make([]kops.VolumeMountSpec, len(*in))
for i := range *in { for i := range *in {
// TODO: Inefficient conversion - can we improve it? if err := Convert_v1alpha2_VolumeMountSpec_To_kops_VolumeMountSpec(&(*in)[i], &(*out)[i], s); err != nil {
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
return err return err
} }
} }
@ -3450,10 +3444,9 @@ func autoConvert_kops_InstanceGroupSpec_To_v1alpha2_InstanceGroupSpec(in *kops.I
out.RootVolumeEncryption = in.RootVolumeEncryption out.RootVolumeEncryption = in.RootVolumeEncryption
if in.Volumes != nil { if in.Volumes != nil {
in, out := &in.Volumes, &out.Volumes in, out := &in.Volumes, &out.Volumes
*out = make([]*VolumeSpec, len(*in)) *out = make([]VolumeSpec, len(*in))
for i := range *in { for i := range *in {
// TODO: Inefficient conversion - can we improve it? if err := Convert_kops_VolumeSpec_To_v1alpha2_VolumeSpec(&(*in)[i], &(*out)[i], s); err != nil {
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
return err return err
} }
} }
@ -3462,10 +3455,9 @@ func autoConvert_kops_InstanceGroupSpec_To_v1alpha2_InstanceGroupSpec(in *kops.I
} }
if in.VolumeMounts != nil { if in.VolumeMounts != nil {
in, out := &in.VolumeMounts, &out.VolumeMounts in, out := &in.VolumeMounts, &out.VolumeMounts
*out = make([]*VolumeMountSpec, len(*in)) *out = make([]VolumeMountSpec, len(*in))
for i := range *in { for i := range *in {
// TODO: Inefficient conversion - can we improve it? if err := Convert_kops_VolumeMountSpec_To_v1alpha2_VolumeMountSpec(&(*in)[i], &(*out)[i], s); err != nil {
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
return err return err
} }
} }

40
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View File

@ -720,13 +720,9 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
} }
if in.EtcdClusters != nil { if in.EtcdClusters != nil {
in, out := &in.EtcdClusters, &out.EtcdClusters in, out := &in.EtcdClusters, &out.EtcdClusters
*out = make([]*EtcdClusterSpec, len(*in)) *out = make([]EtcdClusterSpec, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] != nil { (*in)[i].DeepCopyInto(&(*out)[i])
in, out := &(*in)[i], &(*out)[i]
*out = new(EtcdClusterSpec)
(*in).DeepCopyInto(*out)
}
} }
} }
if in.Containerd != nil { if in.Containerd != nil {
@ -1201,13 +1197,9 @@ func (in *EtcdClusterSpec) DeepCopyInto(out *EtcdClusterSpec) {
*out = *in *out = *in
if in.Members != nil { if in.Members != nil {
in, out := &in.Members, &out.Members in, out := &in.Members, &out.Members
*out = make([]*EtcdMemberSpec, len(*in)) *out = make([]EtcdMemberSpec, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] != nil { (*in)[i].DeepCopyInto(&(*out)[i])
in, out := &(*in)[i], &(*out)[i]
*out = new(EtcdMemberSpec)
(*in).DeepCopyInto(*out)
}
} }
} }
if in.LeaderElectionTimeout != nil { if in.LeaderElectionTimeout != nil {
@ -1704,24 +1696,16 @@ func (in *InstanceGroupSpec) DeepCopyInto(out *InstanceGroupSpec) {
} }
if in.Volumes != nil { if in.Volumes != nil {
in, out := &in.Volumes, &out.Volumes in, out := &in.Volumes, &out.Volumes
*out = make([]*VolumeSpec, len(*in)) *out = make([]VolumeSpec, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] != nil { (*in)[i].DeepCopyInto(&(*out)[i])
in, out := &(*in)[i], &(*out)[i]
*out = new(VolumeSpec)
(*in).DeepCopyInto(*out)
}
} }
} }
if in.VolumeMounts != nil { if in.VolumeMounts != nil {
in, out := &in.VolumeMounts, &out.VolumeMounts in, out := &in.VolumeMounts, &out.VolumeMounts
*out = make([]*VolumeMountSpec, len(*in)) *out = make([]VolumeMountSpec, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] != nil { (*in)[i].DeepCopyInto(&(*out)[i])
in, out := &(*in)[i], &(*out)[i]
*out = new(VolumeMountSpec)
(*in).DeepCopyInto(*out)
}
} }
} }
if in.Subnets != nil { if in.Subnets != nil {
@ -3273,12 +3257,8 @@ func (in *NodeAuthorizerSpec) DeepCopyInto(out *NodeAuthorizerSpec) {
*out = *in *out = *in
if in.Features != nil { if in.Features != nil {
in, out := &in.Features, &out.Features in, out := &in.Features, &out.Features
*out = new([]string) *out = make([]string, len(*in))
if **in != nil { copy(*out, *in)
in, out := *in, *out
*out = make([]string, len(*in))
copy(*out, *in)
}
} }
if in.Interval != nil { if in.Interval != nil {
in, out := &in.Interval, &out.Interval in, out := &in.Interval, &out.Interval

21
pkg/apis/kops/validation/cluster.go
View File

@ -27,11 +27,11 @@ func ValidateClusterUpdate(obj *kops.Cluster, status *kops.ClusterStatus, old *k
// Validate etcd cluster changes // Validate etcd cluster changes
{ {
newClusters := make(map[string]*kops.EtcdClusterSpec) newClusters := make(map[string]kops.EtcdClusterSpec)
for _, etcdCluster := range obj.Spec.EtcdClusters { for _, etcdCluster := range obj.Spec.EtcdClusters {
newClusters[etcdCluster.Name] = etcdCluster newClusters[etcdCluster.Name] = etcdCluster
} }
oldClusters := make(map[string]*kops.EtcdClusterSpec) oldClusters := make(map[string]kops.EtcdClusterSpec)
for _, etcdCluster := range old.Spec.EtcdClusters { for _, etcdCluster := range old.Spec.EtcdClusters {
oldClusters[etcdCluster.Name] = etcdCluster oldClusters[etcdCluster.Name] = etcdCluster
} }
@ -39,14 +39,12 @@ func ValidateClusterUpdate(obj *kops.Cluster, status *kops.ClusterStatus, old *k
for k, newCluster := range newClusters { for k, newCluster := range newClusters {
fp := field.NewPath("spec", "etcdClusters").Key(k) fp := field.NewPath("spec", "etcdClusters").Key(k)
oldCluster := oldClusters[k] if oldCluster, ok := oldClusters[k]; ok {
if oldCluster != nil {
allErrs = append(allErrs, validateEtcdClusterUpdate(fp, newCluster, status, oldCluster)...) allErrs = append(allErrs, validateEtcdClusterUpdate(fp, newCluster, status, oldCluster)...)
} }
} }
for k := range oldClusters { for k := range oldClusters {
newCluster := newClusters[k] if _, ok := newClusters[k]; !ok {
if newCluster == nil {
fp := field.NewPath("spec", "etcdClusters").Key(k) fp := field.NewPath("spec", "etcdClusters").Key(k)
allErrs = append(allErrs, field.Forbidden(fp, "EtcdClusters cannot be removed")) allErrs = append(allErrs, field.Forbidden(fp, "EtcdClusters cannot be removed"))
} }
@ -56,7 +54,7 @@ func ValidateClusterUpdate(obj *kops.Cluster, status *kops.ClusterStatus, old *k
return allErrs return allErrs
} }
func validateEtcdClusterUpdate(fp *field.Path, obj *kops.EtcdClusterSpec, status *kops.ClusterStatus, old *kops.EtcdClusterSpec) field.ErrorList { func validateEtcdClusterUpdate(fp *field.Path, obj kops.EtcdClusterSpec, status *kops.ClusterStatus, old kops.EtcdClusterSpec) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if obj.Name != old.Name { if obj.Name != old.Name {
@ -75,11 +73,11 @@ func validateEtcdClusterUpdate(fp *field.Path, obj *kops.EtcdClusterSpec, status
// If the etcd cluster has been created (i.e. if we have status) then we can't support some changes // If the etcd cluster has been created (i.e. if we have status) then we can't support some changes
if etcdClusterStatus != nil { if etcdClusterStatus != nil {
newMembers := make(map[string]*kops.EtcdMemberSpec) newMembers := make(map[string]kops.EtcdMemberSpec)
for _, member := range obj.Members { for _, member := range obj.Members {
newMembers[member.Name] = member newMembers[member.Name] = member
} }
oldMembers := make(map[string]*kops.EtcdMemberSpec) oldMembers := make(map[string]kops.EtcdMemberSpec)
for _, member := range old.Members { for _, member := range old.Members {
oldMembers[member.Name] = member oldMembers[member.Name] = member
} }
@ -87,8 +85,7 @@ func validateEtcdClusterUpdate(fp *field.Path, obj *kops.EtcdClusterSpec, status
for k, newMember := range newMembers { for k, newMember := range newMembers {
fp := fp.Child("etcdMembers").Key(k) fp := fp.Child("etcdMembers").Key(k)
oldMember := oldMembers[k] if oldMember, ok := oldMembers[k]; ok {
if oldMember != nil {
allErrs = append(allErrs, validateEtcdMemberUpdate(fp, newMember, etcdClusterStatus, oldMember)...) allErrs = append(allErrs, validateEtcdMemberUpdate(fp, newMember, etcdClusterStatus, oldMember)...)
} }
} }
@ -97,7 +94,7 @@ func validateEtcdClusterUpdate(fp *field.Path, obj *kops.EtcdClusterSpec, status
return allErrs return allErrs
} }
func validateEtcdMemberUpdate(fp *field.Path, obj *kops.EtcdMemberSpec, status *kops.EtcdClusterStatus, old *kops.EtcdMemberSpec) field.ErrorList { func validateEtcdMemberUpdate(fp *field.Path, obj kops.EtcdMemberSpec, status *kops.EtcdClusterStatus, old kops.EtcdMemberSpec) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if obj.Name != old.Name { if obj.Name != old.Name {

28
pkg/apis/kops/validation/cluster_test.go
View File

@ -26,15 +26,15 @@ import (
func TestValidEtcdChanges(t *testing.T) { func TestValidEtcdChanges(t *testing.T) {
grid := []struct { grid := []struct {
OldSpec *kops.EtcdClusterSpec OldSpec kops.EtcdClusterSpec
NewSpec *kops.EtcdClusterSpec NewSpec kops.EtcdClusterSpec
Status *kops.ClusterStatus Status *kops.ClusterStatus
Details string Details string
}{ }{
{ {
OldSpec: &kops.EtcdClusterSpec{ OldSpec: kops.EtcdClusterSpec{
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "a", Name: "a",
InstanceGroup: fi.String("eu-central-1a"), InstanceGroup: fi.String("eu-central-1a"),
@ -50,9 +50,9 @@ func TestValidEtcdChanges(t *testing.T) {
}, },
}, },
NewSpec: &kops.EtcdClusterSpec{ NewSpec: kops.EtcdClusterSpec{
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "a", Name: "a",
InstanceGroup: fi.String("eu-central-1a"), InstanceGroup: fi.String("eu-central-1a"),
@ -80,9 +80,9 @@ func TestValidEtcdChanges(t *testing.T) {
}, },
{ {
OldSpec: &kops.EtcdClusterSpec{ OldSpec: kops.EtcdClusterSpec{
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "a", Name: "a",
InstanceGroup: fi.String("eu-central-1a"), InstanceGroup: fi.String("eu-central-1a"),
@ -90,9 +90,9 @@ func TestValidEtcdChanges(t *testing.T) {
}, },
}, },
NewSpec: &kops.EtcdClusterSpec{ NewSpec: kops.EtcdClusterSpec{
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "a", Name: "a",
InstanceGroup: fi.String("eu-central-1a"), InstanceGroup: fi.String("eu-central-1a"),
@ -120,9 +120,9 @@ func TestValidEtcdChanges(t *testing.T) {
}, },
{ {
OldSpec: &kops.EtcdClusterSpec{ OldSpec: kops.EtcdClusterSpec{
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "a", Name: "a",
InstanceGroup: fi.String("eu-central-1a"), InstanceGroup: fi.String("eu-central-1a"),
@ -130,9 +130,9 @@ func TestValidEtcdChanges(t *testing.T) {
}, },
}, },
NewSpec: &kops.EtcdClusterSpec{ NewSpec: kops.EtcdClusterSpec{
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "a", Name: "a",
InstanceGroup: fi.String("eu-central-1a"), InstanceGroup: fi.String("eu-central-1a"),

4
pkg/apis/kops/validation/instancegroup.go
View File

@ -123,7 +123,7 @@ func ValidateInstanceGroup(g *kops.InstanceGroup, cloud fi.Cloud) field.ErrorLis
} }
// validateVolumeSpec is responsible for checking a volume spec is ok // validateVolumeSpec is responsible for checking a volume spec is ok
func validateVolumeSpec(path *field.Path, v *kops.VolumeSpec) field.ErrorList { func validateVolumeSpec(path *field.Path, v kops.VolumeSpec) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if v.Device == "" { if v.Device == "" {
@ -137,7 +137,7 @@ func validateVolumeSpec(path *field.Path, v *kops.VolumeSpec) field.ErrorList {
} }
// validateVolumeMountSpec is responsible for checking the volume mount is ok // validateVolumeMountSpec is responsible for checking the volume mount is ok
func validateVolumeMountSpec(path *field.Path, spec *kops.VolumeMountSpec) field.ErrorList { func validateVolumeMountSpec(path *field.Path, spec kops.VolumeMountSpec) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if spec.Device == "" { if spec.Device == "" {

8
pkg/apis/kops/validation/instancegroup_test.go
View File

@ -102,10 +102,10 @@ func TestValidMasterInstanceGroup(t *testing.T) {
{ {
Cluster: &kops.Cluster{ Cluster: &kops.Cluster{
Spec: kops.ClusterSpec{ Spec: kops.ClusterSpec{
EtcdClusters: []*kops.EtcdClusterSpec{ EtcdClusters: []kops.EtcdClusterSpec{
{ {
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "a", Name: "a",
InstanceGroup: fi.String("eu-central-1a"), InstanceGroup: fi.String("eu-central-1a"),
@ -137,10 +137,10 @@ func TestValidMasterInstanceGroup(t *testing.T) {
{ {
Cluster: &kops.Cluster{ Cluster: &kops.Cluster{
Spec: kops.ClusterSpec{ Spec: kops.ClusterSpec{
EtcdClusters: []*kops.EtcdClusterSpec{ EtcdClusters: []kops.EtcdClusterSpec{
{ {
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "a", Name: "a",
InstanceGroup: fi.String("eu-central-1a"), InstanceGroup: fi.String("eu-central-1a"),

16
pkg/apis/kops/validation/validation.go
View File

@ -795,7 +795,7 @@ func validateAdditionalPolicy(role string, policy string, fldPath *field.Path) f
return errs return errs
} }
func validateEtcdClusterSpec(spec *kops.EtcdClusterSpec, c *kops.Cluster, fieldPath *field.Path) field.ErrorList { func validateEtcdClusterSpec(spec kops.EtcdClusterSpec, c *kops.Cluster, fieldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if spec.Name == "" { if spec.Name == "" {
@ -823,7 +823,7 @@ func validateEtcdClusterSpec(spec *kops.EtcdClusterSpec, c *kops.Cluster, fieldP
} }
// validateEtcdBackupStore checks that the etcd clusters backupStore path is unique. // validateEtcdBackupStore checks that the etcd clusters backupStore path is unique.
func validateEtcdBackupStore(specs []*kops.EtcdClusterSpec, fieldPath *field.Path) field.ErrorList { func validateEtcdBackupStore(specs []kops.EtcdClusterSpec, fieldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
etcdBackupStore := make(map[string]bool) etcdBackupStore := make(map[string]bool)
for _, x := range specs { for _, x := range specs {
@ -837,7 +837,7 @@ func validateEtcdBackupStore(specs []*kops.EtcdClusterSpec, fieldPath *field.Pat
} }
// validateEtcdTLS checks the TLS settings for etcd are valid // validateEtcdTLS checks the TLS settings for etcd are valid
func validateEtcdTLS(specs []*kops.EtcdClusterSpec, fieldPath *field.Path) field.ErrorList { func validateEtcdTLS(specs []kops.EtcdClusterSpec, fieldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
var usingTLS int var usingTLS int
for _, x := range specs { for _, x := range specs {
@ -854,7 +854,7 @@ func validateEtcdTLS(specs []*kops.EtcdClusterSpec, fieldPath *field.Path) field
} }
// validateEtcdStorage is responsible for checking versions are identical. // validateEtcdStorage is responsible for checking versions are identical.
func validateEtcdStorage(specs []*kops.EtcdClusterSpec, fieldPath *field.Path) field.ErrorList { func validateEtcdStorage(specs []kops.EtcdClusterSpec, fieldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
version := specs[0].Version version := specs[0].Version
for i, x := range specs { for i, x := range specs {
@ -868,7 +868,7 @@ func validateEtcdStorage(specs []*kops.EtcdClusterSpec, fieldPath *field.Path) f
// validateEtcdVersion is responsible for validating the storage version of etcd // validateEtcdVersion is responsible for validating the storage version of etcd
// @TODO semvar package doesn't appear to ignore a 'v' in v1.1.1; could be a problem later down the line // @TODO semvar package doesn't appear to ignore a 'v' in v1.1.1; could be a problem later down the line
func validateEtcdVersion(spec *kops.EtcdClusterSpec, fieldPath *field.Path, minimalVersion *semver.Version) field.ErrorList { func validateEtcdVersion(spec kops.EtcdClusterSpec, fieldPath *field.Path, minimalVersion *semver.Version) field.ErrorList {
// @check if the storage is specified that it's valid // @check if the storage is specified that it's valid
if minimalVersion == nil { if minimalVersion == nil {
@ -898,7 +898,7 @@ func validateEtcdVersion(spec *kops.EtcdClusterSpec, fieldPath *field.Path, mini
} }
// validateEtcdMemberSpec is responsible for validate the cluster member // validateEtcdMemberSpec is responsible for validate the cluster member
func validateEtcdMemberSpec(spec *kops.EtcdMemberSpec, fieldPath *field.Path) field.ErrorList { func validateEtcdMemberSpec(spec kops.EtcdMemberSpec, fieldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if spec.Name == "" { if spec.Name == "" {
allErrs = append(allErrs, field.Required(fieldPath.Child("name"), "etcdMember did not have name")) allErrs = append(allErrs, field.Required(fieldPath.Child("name"), "etcdMember did not have name"))
@ -911,7 +911,7 @@ func validateEtcdMemberSpec(spec *kops.EtcdMemberSpec, fieldPath *field.Path) fi
return allErrs return allErrs
} }
func ValidateEtcdVersionForCalicoV3(e *kops.EtcdClusterSpec, majorVersion string, fldPath *field.Path) field.ErrorList { func ValidateEtcdVersionForCalicoV3(e kops.EtcdClusterSpec, majorVersion string, fldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if e.Version == "" { if e.Version == "" {
@ -932,7 +932,7 @@ func ValidateEtcdVersionForCalicoV3(e *kops.EtcdClusterSpec, majorVersion string
return allErrs return allErrs
} }
func validateNetworkingCalico(v *kops.CalicoNetworkingSpec, e *kops.EtcdClusterSpec, fldPath *field.Path) field.ErrorList { func validateNetworkingCalico(v *kops.CalicoNetworkingSpec, e kops.EtcdClusterSpec, fldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if v.TyphaReplicas < 0 { if v.TyphaReplicas < 0 {

40
pkg/apis/kops/validation/validation_test.go
View File

@ -342,10 +342,10 @@ func Test_Validate_AdditionalPolicies(t *testing.T) {
Subnets: []kops.ClusterSubnetSpec{ Subnets: []kops.ClusterSubnetSpec{
{Name: "subnet1"}, {Name: "subnet1"},
}, },
EtcdClusters: []*kops.EtcdClusterSpec{ EtcdClusters: []kops.EtcdClusterSpec{
{ {
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "us-test-1a", Name: "us-test-1a",
InstanceGroup: fi.String("master-us-test-1a"), InstanceGroup: fi.String("master-us-test-1a"),
@ -362,7 +362,7 @@ func Test_Validate_AdditionalPolicies(t *testing.T) {
type caliInput struct { type caliInput struct {
Calico *kops.CalicoNetworkingSpec Calico *kops.CalicoNetworkingSpec
Etcd *kops.EtcdClusterSpec Etcd kops.EtcdClusterSpec
} }
func Test_Validate_Calico(t *testing.T) { func Test_Validate_Calico(t *testing.T) {
@ -373,7 +373,7 @@ func Test_Validate_Calico(t *testing.T) {
{ {
Input: caliInput{ Input: caliInput{
Calico: &kops.CalicoNetworkingSpec{}, Calico: &kops.CalicoNetworkingSpec{},
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
}, },
{ {
@ -381,7 +381,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
TyphaReplicas: 3, TyphaReplicas: 3,
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
}, },
{ {
@ -389,7 +389,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
TyphaReplicas: -1, TyphaReplicas: -1,
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
ExpectedErrors: []string{"Invalid value::calico.typhaReplicas"}, ExpectedErrors: []string{"Invalid value::calico.typhaReplicas"},
}, },
@ -398,7 +398,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
MajorVersion: "v3", MajorVersion: "v3",
}, },
Etcd: &kops.EtcdClusterSpec{ Etcd: kops.EtcdClusterSpec{
Version: "3.2.18", Version: "3.2.18",
}, },
}, },
@ -408,7 +408,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
MajorVersion: "v3", MajorVersion: "v3",
}, },
Etcd: &kops.EtcdClusterSpec{ Etcd: kops.EtcdClusterSpec{
Version: "2.2.18", Version: "2.2.18",
}, },
}, },
@ -419,7 +419,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv4AutoDetectionMethod: "first-found", IPv4AutoDetectionMethod: "first-found",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
}, },
{ {
@ -427,7 +427,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv6AutoDetectionMethod: "first-found", IPv6AutoDetectionMethod: "first-found",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
}, },
{ {
@ -435,7 +435,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv4AutoDetectionMethod: "can-reach=8.8.8.8", IPv4AutoDetectionMethod: "can-reach=8.8.8.8",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
}, },
{ {
@ -443,7 +443,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv6AutoDetectionMethod: "can-reach=2001:4860:4860::8888", IPv6AutoDetectionMethod: "can-reach=2001:4860:4860::8888",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
}, },
{ {
@ -451,7 +451,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv4AutoDetectionMethod: "bogus", IPv4AutoDetectionMethod: "bogus",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
ExpectedErrors: []string{"Invalid value::calico.ipv4AutoDetectionMethod"}, ExpectedErrors: []string{"Invalid value::calico.ipv4AutoDetectionMethod"},
}, },
@ -460,7 +460,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv6AutoDetectionMethod: "bogus", IPv6AutoDetectionMethod: "bogus",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
ExpectedErrors: []string{"Invalid value::calico.ipv6AutoDetectionMethod"}, ExpectedErrors: []string{"Invalid value::calico.ipv6AutoDetectionMethod"},
}, },
@ -469,7 +469,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv6AutoDetectionMethod: "interface=", IPv6AutoDetectionMethod: "interface=",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
ExpectedErrors: []string{"Invalid value::calico.ipv6AutoDetectionMethod"}, ExpectedErrors: []string{"Invalid value::calico.ipv6AutoDetectionMethod"},
}, },
@ -478,7 +478,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv4AutoDetectionMethod: "interface=en.*,eth0", IPv4AutoDetectionMethod: "interface=en.*,eth0",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
}, },
{ {
@ -486,7 +486,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv6AutoDetectionMethod: "skip-interface=en.*,eth0", IPv6AutoDetectionMethod: "skip-interface=en.*,eth0",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
}, },
{ {
@ -494,7 +494,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv4AutoDetectionMethod: "interface=(,en1", IPv4AutoDetectionMethod: "interface=(,en1",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
ExpectedErrors: []string{"Invalid value::calico.ipv4AutoDetectionMethod"}, ExpectedErrors: []string{"Invalid value::calico.ipv4AutoDetectionMethod"},
}, },
@ -503,7 +503,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv4AutoDetectionMethod: "interface=foo=bar", IPv4AutoDetectionMethod: "interface=foo=bar",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
ExpectedErrors: []string{"Invalid value::calico.ipv4AutoDetectionMethod"}, ExpectedErrors: []string{"Invalid value::calico.ipv4AutoDetectionMethod"},
}, },
@ -512,7 +512,7 @@ func Test_Validate_Calico(t *testing.T) {
Calico: &kops.CalicoNetworkingSpec{ Calico: &kops.CalicoNetworkingSpec{
IPv4AutoDetectionMethod: "=en0,eth.*", IPv4AutoDetectionMethod: "=en0,eth.*",
}, },
Etcd: &kops.EtcdClusterSpec{}, Etcd: kops.EtcdClusterSpec{},
}, },
ExpectedErrors: []string{"Invalid value::calico.ipv4AutoDetectionMethod"}, ExpectedErrors: []string{"Invalid value::calico.ipv4AutoDetectionMethod"},
}, },

40
pkg/apis/kops/zz_generated.deepcopy.go
View File

@ -820,13 +820,9 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
} }
if in.EtcdClusters != nil { if in.EtcdClusters != nil {
in, out := &in.EtcdClusters, &out.EtcdClusters in, out := &in.EtcdClusters, &out.EtcdClusters
*out = make([]*EtcdClusterSpec, len(*in)) *out = make([]EtcdClusterSpec, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] != nil { (*in)[i].DeepCopyInto(&(*out)[i])
in, out := &(*in)[i], &(*out)[i]
*out = new(EtcdClusterSpec)
(*in).DeepCopyInto(*out)
}
} }
} }
if in.Containerd != nil { if in.Containerd != nil {
@ -1324,13 +1320,9 @@ func (in *EtcdClusterSpec) DeepCopyInto(out *EtcdClusterSpec) {
*out = *in *out = *in
if in.Members != nil { if in.Members != nil {
in, out := &in.Members, &out.Members in, out := &in.Members, &out.Members
*out = make([]*EtcdMemberSpec, len(*in)) *out = make([]EtcdMemberSpec, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] != nil { (*in)[i].DeepCopyInto(&(*out)[i])
in, out := &(*in)[i], &(*out)[i]
*out = new(EtcdMemberSpec)
(*in).DeepCopyInto(*out)
}
} }
} }
if in.LeaderElectionTimeout != nil { if in.LeaderElectionTimeout != nil {
@ -1870,24 +1862,16 @@ func (in *InstanceGroupSpec) DeepCopyInto(out *InstanceGroupSpec) {
} }
if in.Volumes != nil { if in.Volumes != nil {
in, out := &in.Volumes, &out.Volumes in, out := &in.Volumes, &out.Volumes
*out = make([]*VolumeSpec, len(*in)) *out = make([]VolumeSpec, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] != nil { (*in)[i].DeepCopyInto(&(*out)[i])
in, out := &(*in)[i], &(*out)[i]
*out = new(VolumeSpec)
(*in).DeepCopyInto(*out)
}
} }
} }
if in.VolumeMounts != nil { if in.VolumeMounts != nil {
in, out := &in.VolumeMounts, &out.VolumeMounts in, out := &in.VolumeMounts, &out.VolumeMounts
*out = make([]*VolumeMountSpec, len(*in)) *out = make([]VolumeMountSpec, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] != nil { (*in)[i].DeepCopyInto(&(*out)[i])
in, out := &(*in)[i], &(*out)[i]
*out = new(VolumeMountSpec)
(*in).DeepCopyInto(*out)
}
} }
} }
if in.Subnets != nil { if in.Subnets != nil {
@ -3471,12 +3455,8 @@ func (in *NodeAuthorizerSpec) DeepCopyInto(out *NodeAuthorizerSpec) {
*out = *in *out = *in
if in.Features != nil { if in.Features != nil {
in, out := &in.Features, &out.Features in, out := &in.Features, &out.Features
*out = new([]string) *out = make([]string, len(*in))
if **in != nil { copy(*out, *in)
in, out := *in, *out
*out = make([]string, len(*in))
copy(*out, *in)
}
} }
if in.Interval != nil { if in.Interval != nil {
in, out := &in.Interval, &out.Interval in, out := &in.Interval, &out.Interval

2
pkg/apis/nodeup/config.go
View File

@ -65,7 +65,7 @@ type Config struct {
// it would appear in sysctl.conf. // it would appear in sysctl.conf.
SysctlParameters []string `json:",omitempty"` SysctlParameters []string `json:",omitempty"`
// VolumeMounts are a collection of volume mounts. // VolumeMounts are a collection of volume mounts.
VolumeMounts []*kops.VolumeMountSpec `json:",omitempty"` VolumeMounts []kops.VolumeMountSpec `json:",omitempty"`
} }
// Image is a docker image we should pre-load // Image is a docker image we should pre-load

19
pkg/commands/set_cluster.go
View File

@ -116,31 +116,32 @@ func SetClusterFields(fields []string, cluster *api.Cluster, instanceGroups []*a
if err != nil { if err != nil {
return fmt.Errorf("unknown boolean value: %q", kv[1]) return fmt.Errorf("unknown boolean value: %q", kv[1])
} }
for _, c := range cluster.Spec.EtcdClusters { for i := range cluster.Spec.EtcdClusters {
c.EnableEtcdTLS = v cluster.Spec.EtcdClusters[i].EnableEtcdTLS = v
} }
case "cluster.spec.etcdClusters[*].enableTLSAuth": case "cluster.spec.etcdClusters[*].enableTLSAuth":
v, err := strconv.ParseBool(kv[1]) v, err := strconv.ParseBool(kv[1])
if err != nil { if err != nil {
return fmt.Errorf("unknown boolean value: %q", kv[1]) return fmt.Errorf("unknown boolean value: %q", kv[1])
} }
for _, c := range cluster.Spec.EtcdClusters { for i := range cluster.Spec.EtcdClusters {
c.EnableTLSAuth = v cluster.Spec.EtcdClusters[i].EnableTLSAuth = v
} }
case "cluster.spec.etcdClusters[*].version": case "cluster.spec.etcdClusters[*].version":
for _, c := range cluster.Spec.EtcdClusters { for i := range cluster.Spec.EtcdClusters {
c.Version = kv[1] cluster.Spec.EtcdClusters[i].Version = kv[1]
} }
case "cluster.spec.etcdClusters[*].provider": case "cluster.spec.etcdClusters[*].provider":
p, err := toEtcdProviderType(kv[1]) p, err := toEtcdProviderType(kv[1])
if err != nil { if err != nil {
return err return err
} }
for _, etcd := range cluster.Spec.EtcdClusters { for i := range cluster.Spec.EtcdClusters {
etcd.Provider = p cluster.Spec.EtcdClusters[i].Provider = p
} }
case "cluster.spec.etcdClusters[*].manager.image": case "cluster.spec.etcdClusters[*].manager.image":
for _, etcd := range cluster.Spec.EtcdClusters { for i := range cluster.Spec.EtcdClusters {
etcd := &cluster.Spec.EtcdClusters[i]
if etcd.Manager == nil { if etcd.Manager == nil {
etcd.Manager = &api.EtcdManagerSpec{} etcd.Manager = &api.EtcdManagerSpec{}
} }

3
pkg/model/awsmodel/autoscalinggroup.go
View File

@ -231,7 +231,8 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchConfigurationTask(c *fi.ModelB
} }
// @step: add any additional block devices to the launch configuration // @step: add any additional block devices to the launch configuration
for _, x := range ig.Spec.Volumes { for i := range ig.Spec.Volumes {
x := &ig.Spec.Volumes[i]
if x.Type == "" { if x.Type == "" {
x.Type = DefaultVolumeType x.Type = DefaultVolumeType
} }

6
pkg/model/bootstrapscript_test.go
View File

@ -169,10 +169,10 @@ func makeTestCluster(hookSpecRoles []kops.InstanceGroupRole, fileAssetSpecRoles
{Name: "test", Zone: "eu-west-1a"}, {Name: "test", Zone: "eu-west-1a"},
}, },
NonMasqueradeCIDR: "10.100.0.0/16", NonMasqueradeCIDR: "10.100.0.0/16",
EtcdClusters: []*kops.EtcdClusterSpec{ EtcdClusters: []kops.EtcdClusterSpec{
{ {
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "test", Name: "test",
InstanceGroup: s("ig-1"), InstanceGroup: s("ig-1"),
@ -182,7 +182,7 @@ func makeTestCluster(hookSpecRoles []kops.InstanceGroupRole, fileAssetSpecRoles
}, },
{ {
Name: "events", Name: "events",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
Name: "test", Name: "test",
InstanceGroup: s("ig-1"), InstanceGroup: s("ig-1"),

8
pkg/model/components/etcd.go
View File

@ -50,7 +50,8 @@ const (
func (b *EtcdOptionsBuilder) BuildOptions(o interface{}) error { func (b *EtcdOptionsBuilder) BuildOptions(o interface{}) error {
spec := o.(*kops.ClusterSpec) spec := o.(*kops.ClusterSpec)
for _, c := range spec.EtcdClusters { for i := range spec.EtcdClusters {
c := &spec.EtcdClusters[i]
if c.Provider == "" { if c.Provider == "" {
if b.IsKubernetesGTE("1.12") { if b.IsKubernetesGTE("1.12") {
c.Provider = kops.EtcdProviderTypeManager c.Provider = kops.EtcdProviderTypeManager
@ -110,11 +111,8 @@ func (b *EtcdOptionsBuilder) BuildOptions(o interface{}) error {
c.EnableTLSAuth = true c.EnableTLSAuth = true
} }
} }
}
// Remap the well known images
for _, c := range spec.EtcdClusters {
// Remap the well known images
// We remap the etcd manager image when we build the manifest, // We remap the etcd manager image when we build the manifest,
// but we need to map the standalone images here because protokube launches them // but we need to map the standalone images here because protokube launches them

4
pkg/model/components/etcdmanager/model.go
View File

@ -157,7 +157,7 @@ type etcdClusterSpec struct {
EtcdVersion string `json:"etcdVersion,omitempty"` EtcdVersion string `json:"etcdVersion,omitempty"`
} }
func (b *EtcdManagerBuilder) buildManifest(etcdCluster *kops.EtcdClusterSpec) (*v1.Pod, error) { func (b *EtcdManagerBuilder) buildManifest(etcdCluster kops.EtcdClusterSpec) (*v1.Pod, error) {
return b.buildPod(etcdCluster) return b.buildPod(etcdCluster)
} }
@ -199,7 +199,7 @@ spec:
` `
// buildPod creates the pod spec, based on the EtcdClusterSpec // buildPod creates the pod spec, based on the EtcdClusterSpec
func (b *EtcdManagerBuilder) buildPod(etcdCluster *kops.EtcdClusterSpec) (*v1.Pod, error) { func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec) (*v1.Pod, error) {
var pod *v1.Pod var pod *v1.Pod
var container *v1.Container var container *v1.Container

3
pkg/model/components/etcdmanager/options.go
View File

@ -39,7 +39,8 @@ var _ loader.OptionsBuilder = &EtcdManagerOptionsBuilder{}
func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error { func (b *EtcdManagerOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec := o.(*kops.ClusterSpec) clusterSpec := o.(*kops.ClusterSpec)
for _, etcdCluster := range clusterSpec.EtcdClusters { for i := range clusterSpec.EtcdClusters {
etcdCluster := &clusterSpec.EtcdClusters[i]
if etcdCluster.Provider != kops.EtcdProviderTypeManager { if etcdCluster.Provider != kops.EtcdProviderTypeManager {
continue continue
} }

2
pkg/model/components/node-authorizer/options.go
View File

@ -86,7 +86,7 @@ func (b *OptionsBuilder) BuildOptions(o interface{}) error {
case kops.CloudProviderAWS: case kops.CloudProviderAWS:
features = append(features, "verify-signature") features = append(features, "verify-signature")
} }
na.NodeAuthorizer.Features = &features na.NodeAuthorizer.Features = features
} }
} }
} }

8
pkg/model/iam/iam_builder_test.go
View File

@ -144,9 +144,9 @@ func TestPolicyGeneration(t *testing.T) {
Legacy: x.LegacyIAM, Legacy: x.LegacyIAM,
AllowContainerRegistry: x.AllowContainerRegistry, AllowContainerRegistry: x.AllowContainerRegistry,
}, },
EtcdClusters: []*kops.EtcdClusterSpec{ EtcdClusters: []kops.EtcdClusterSpec{
{ {
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
KmsKeyId: aws.String("key-id-1"), KmsKeyId: aws.String("key-id-1"),
}, },
@ -156,10 +156,10 @@ func TestPolicyGeneration(t *testing.T) {
}, },
}, },
{ {
Members: []*kops.EtcdMemberSpec{}, Members: []kops.EtcdMemberSpec{},
}, },
{ {
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{ {
KmsKeyId: aws.String("key-id-3"), KmsKeyId: aws.String("key-id-3"),
}, },

10
pkg/model/master_volumes.go
View File

@ -115,7 +115,7 @@ func (b *MasterVolumeBuilder) Build(c *fi.ModelBuilderContext) error {
return nil return nil
} }
func (b *MasterVolumeBuilder) addAWSVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd *kops.EtcdClusterSpec, m *kops.EtcdMemberSpec, allMembers []string) error { func (b *MasterVolumeBuilder) addAWSVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd kops.EtcdClusterSpec, m kops.EtcdMemberSpec, allMembers []string) error {
volumeType := fi.StringValue(m.VolumeType) volumeType := fi.StringValue(m.VolumeType)
volumeIops := fi.Int32Value(m.VolumeIops) volumeIops := fi.Int32Value(m.VolumeIops)
switch volumeType { switch volumeType {
@ -171,7 +171,7 @@ func (b *MasterVolumeBuilder) addAWSVolume(c *fi.ModelBuilderContext, name strin
return nil return nil
} }
func (b *MasterVolumeBuilder) addDOVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd *kops.EtcdClusterSpec, m *kops.EtcdMemberSpec, allMembers []string) { func (b *MasterVolumeBuilder) addDOVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd kops.EtcdClusterSpec, m kops.EtcdMemberSpec, allMembers []string) {
// required that names start with a lower case and only contains letters, numbers and hyphens // required that names start with a lower case and only contains letters, numbers and hyphens
name = "kops-" + do.SafeClusterName(name) name = "kops-" + do.SafeClusterName(name)
@ -198,7 +198,7 @@ func (b *MasterVolumeBuilder) addDOVolume(c *fi.ModelBuilderContext, name string
c.AddTask(t) c.AddTask(t)
} }
func (b *MasterVolumeBuilder) addGCEVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd *kops.EtcdClusterSpec, m *kops.EtcdMemberSpec, allMembers []string) { func (b *MasterVolumeBuilder) addGCEVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd kops.EtcdClusterSpec, m kops.EtcdMemberSpec, allMembers []string) {
volumeType := fi.StringValue(m.VolumeType) volumeType := fi.StringValue(m.VolumeType)
if volumeType == "" { if volumeType == "" {
volumeType = DefaultGCEEtcdVolumeType volumeType = DefaultGCEEtcdVolumeType
@ -245,7 +245,7 @@ func (b *MasterVolumeBuilder) addGCEVolume(c *fi.ModelBuilderContext, name strin
c.AddTask(t) c.AddTask(t)
} }
func (b *MasterVolumeBuilder) addOpenstackVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd *kops.EtcdClusterSpec, m *kops.EtcdMemberSpec, allMembers []string) error { func (b *MasterVolumeBuilder) addOpenstackVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd kops.EtcdClusterSpec, m kops.EtcdMemberSpec, allMembers []string) error {
volumeType := fi.StringValue(m.VolumeType) volumeType := fi.StringValue(m.VolumeType)
if volumeType == "" { if volumeType == "" {
return fmt.Errorf("must set ETCDMemberSpec.VolumeType on Openstack platform") return fmt.Errorf("must set ETCDMemberSpec.VolumeType on Openstack platform")
@ -279,7 +279,7 @@ func (b *MasterVolumeBuilder) addOpenstackVolume(c *fi.ModelBuilderContext, name
return nil return nil
} }
func (b *MasterVolumeBuilder) addALIVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd *kops.EtcdClusterSpec, m *kops.EtcdMemberSpec, allMembers []string) { func (b *MasterVolumeBuilder) addALIVolume(c *fi.ModelBuilderContext, name string, volumeSize int32, zone string, etcd kops.EtcdClusterSpec, m kops.EtcdMemberSpec, allMembers []string) {
//Alicloud does not support volumeName starts with number //Alicloud does not support volumeName starts with number
name = "v" + name name = "v" + name
volumeType := fi.StringValue(m.VolumeType) volumeType := fi.StringValue(m.VolumeType)

8
upup/pkg/fi/cloudup/deepvalidate_test.go
View File

@ -128,10 +128,10 @@ func TestDeepValidate_ExtraMasterZone(t *testing.T) {
func TestDeepValidate_EvenEtcdClusterSize(t *testing.T) { func TestDeepValidate_EvenEtcdClusterSize(t *testing.T) {
c := buildDefaultCluster(t) c := buildDefaultCluster(t)
c.Spec.EtcdClusters = []*kopsapi.EtcdClusterSpec{ c.Spec.EtcdClusters = []kopsapi.EtcdClusterSpec{
{ {
Name: "main", Name: "main",
Members: []*kopsapi.EtcdMemberSpec{ Members: []kopsapi.EtcdMemberSpec{
{Name: "us-mock-1a", InstanceGroup: fi.String("us-mock-1a")}, {Name: "us-mock-1a", InstanceGroup: fi.String("us-mock-1a")},
{Name: "us-mock-1b", InstanceGroup: fi.String("us-mock-1b")}, {Name: "us-mock-1b", InstanceGroup: fi.String("us-mock-1b")},
}, },
@ -150,10 +150,10 @@ func TestDeepValidate_EvenEtcdClusterSize(t *testing.T) {
func TestDeepValidate_MissingEtcdMember(t *testing.T) { func TestDeepValidate_MissingEtcdMember(t *testing.T) {
c := buildDefaultCluster(t) c := buildDefaultCluster(t)
c.Spec.EtcdClusters = []*kopsapi.EtcdClusterSpec{ c.Spec.EtcdClusters = []kopsapi.EtcdClusterSpec{
{ {
Name: "main", Name: "main",
Members: []*kopsapi.EtcdMemberSpec{ Members: []kopsapi.EtcdMemberSpec{
{Name: "us-mock-1a", InstanceGroup: fi.String("us-mock-1a")}, {Name: "us-mock-1a", InstanceGroup: fi.String("us-mock-1a")},
{Name: "us-mock-1b", InstanceGroup: fi.String("us-mock-1b")}, {Name: "us-mock-1b", InstanceGroup: fi.String("us-mock-1b")},
{Name: "us-mock-1c", InstanceGroup: fi.String("us-mock-1c")}, {Name: "us-mock-1c", InstanceGroup: fi.String("us-mock-1c")},

6
upup/pkg/fi/cloudup/dns_test.go
View File

@ -29,10 +29,10 @@ func TestPrecreateDNSNames(t *testing.T) {
cluster.ObjectMeta.Name = "cluster1.example.com" cluster.ObjectMeta.Name = "cluster1.example.com"
cluster.Spec.MasterPublicName = "api." + cluster.ObjectMeta.Name cluster.Spec.MasterPublicName = "api." + cluster.ObjectMeta.Name
cluster.Spec.MasterInternalName = "api.internal." + cluster.ObjectMeta.Name cluster.Spec.MasterInternalName = "api.internal." + cluster.ObjectMeta.Name
cluster.Spec.EtcdClusters = []*kops.EtcdClusterSpec{ cluster.Spec.EtcdClusters = []kops.EtcdClusterSpec{
{ {
Name: "main", Name: "main",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{Name: "zone1"}, {Name: "zone1"},
{Name: "zone2"}, {Name: "zone2"},
{Name: "zone3"}, {Name: "zone3"},
@ -40,7 +40,7 @@ func TestPrecreateDNSNames(t *testing.T) {
}, },
{ {
Name: "events", Name: "events",
Members: []*kops.EtcdMemberSpec{ Members: []kops.EtcdMemberSpec{
{Name: "zonea"}, {Name: "zonea"},
{Name: "zoneb"}, {Name: "zoneb"},
{Name: "zonec"}, {Name: "zonec"},

6
upup/pkg/fi/cloudup/new_cluster.go
View File

@ -961,8 +961,8 @@ func initializeOpenstackAPI(opt *NewClusterOptions, cluster *api.Cluster) {
} }
} }
func createEtcdCluster(etcdCluster string, masters []*api.InstanceGroup, encryptEtcdStorage bool, etcdStorageType string) *api.EtcdClusterSpec { func createEtcdCluster(etcdCluster string, masters []*api.InstanceGroup, encryptEtcdStorage bool, etcdStorageType string) api.EtcdClusterSpec {
etcd := &api.EtcdClusterSpec{} etcd := api.EtcdClusterSpec{}
etcd.Name = etcdCluster etcd.Name = etcdCluster
// if this is the main cluster, we use 200 millicores by default. // if this is the main cluster, we use 200 millicores by default.
@ -991,7 +991,7 @@ func createEtcdCluster(etcdCluster string, masters []*api.InstanceGroup, encrypt
names = trimCommonPrefix(names) names = trimCommonPrefix(names)
for i, ig := range masters { for i, ig := range masters {
m := &api.EtcdMemberSpec{} m := api.EtcdMemberSpec{}
if encryptEtcdStorage { if encryptEtcdStorage {
m.EncryptedVolume = &encryptEtcdStorage m.EncryptedVolume = &encryptEtcdStorage
} }

8
upup/pkg/fi/cloudup/populate_cluster_spec.go
View File

@ -138,17 +138,17 @@ func (c *populateClusterSpec) run(clientset simple.Clientset) error {
} }
} }
etcdInstanceGroups := make(map[string]*kopsapi.EtcdMemberSpec) etcdInstanceGroups := make(map[string]kopsapi.EtcdMemberSpec)
etcdNames := make(map[string]*kopsapi.EtcdMemberSpec) etcdNames := make(map[string]kopsapi.EtcdMemberSpec)
for _, m := range etcd.Members { for _, m := range etcd.Members {
if etcdNames[m.Name] != nil { if _, ok := etcdNames[m.Name]; ok {
return fmt.Errorf("EtcdMembers found with same name %q in etcd-cluster %q", m.Name, etcd.Name) return fmt.Errorf("EtcdMembers found with same name %q in etcd-cluster %q", m.Name, etcd.Name)
} }
instanceGroupName := fi.StringValue(m.InstanceGroup) instanceGroupName := fi.StringValue(m.InstanceGroup)
if etcdInstanceGroups[instanceGroupName] != nil { if _, ok := etcdInstanceGroups[instanceGroupName]; ok {
klog.Warningf("EtcdMembers are in the same InstanceGroup %q in etcd-cluster %q (fault-tolerance may be reduced)", instanceGroupName, etcd.Name) klog.Warningf("EtcdMembers are in the same InstanceGroup %q in etcd-cluster %q (fault-tolerance may be reduced)", instanceGroupName, etcd.Name)
} }

4
upup/pkg/fi/cloudup/populatecluster_test.go
View File

@ -74,10 +74,10 @@ func addEtcdClusters(c *kopsapi.Cluster) {
etcdZones := subnetNames.List() etcdZones := subnetNames.List()
for _, etcdCluster := range EtcdClusters { for _, etcdCluster := range EtcdClusters {
etcd := &kopsapi.EtcdClusterSpec{} etcd := kopsapi.EtcdClusterSpec{}
etcd.Name = etcdCluster etcd.Name = etcdCluster
for _, zone := range etcdZones { for _, zone := range etcdZones {
m := &kopsapi.EtcdMemberSpec{} m := kopsapi.EtcdMemberSpec{}
m.Name = zone m.Name = zone
m.InstanceGroup = fi.String(zone) m.InstanceGroup = fi.String(zone)
etcd.Members = append(etcd.Members, m) etcd.Members = append(etcd.Members, m)

4
upup/pkg/fi/cloudup/validation_test.go
View File

@ -41,10 +41,10 @@ func buildDefaultCluster(t *testing.T) *api.Cluster {
for _, etcdCluster := range EtcdClusters { for _, etcdCluster := range EtcdClusters {
etcd := &api.EtcdClusterSpec{} etcd := api.EtcdClusterSpec{}
etcd.Name = etcdCluster etcd.Name = etcdCluster
for _, subnet := range c.Spec.Subnets { for _, subnet := range c.Spec.Subnets {
m := &api.EtcdMemberSpec{} m := api.EtcdMemberSpec{}
m.Name = subnet.Zone m.Name = subnet.Zone
m.InstanceGroup = fi.String("master-" + subnet.Name) m.InstanceGroup = fi.String("master-" + subnet.Name)
etcd.Members = append(etcd.Members, m) etcd.Members = append(etcd.Members, m)

4
upup/pkg/kutil/import_cluster.go
View File

@ -357,12 +357,12 @@ func (x *ImportCluster) ImportAWSCluster(ctx context.Context) error {
// } // }
for _, etcdClusterName := range []string{"main", "events"} { for _, etcdClusterName := range []string{"main", "events"} {
etcdCluster := &kops.EtcdClusterSpec{ etcdCluster := kops.EtcdClusterSpec{
Name: etcdClusterName, Name: etcdClusterName,
} }
for _, ig := range masterInstanceGroups { for _, ig := range masterInstanceGroups {
member := &kops.EtcdMemberSpec{ member := kops.EtcdMemberSpec{
InstanceGroup: fi.String(ig.ObjectMeta.Name), InstanceGroup: fi.String(ig.ObjectMeta.Name),
} }