mirror of https://github.com/kubernetes/kops.git
Rename fields in v1alpha3 status API to fit acronym convention
This commit is contained in:
parent
b9ac79ec6e
commit
e5a6b79c19
|
|
@ -33,6 +33,6 @@ type EtcdMemberStatus struct {
|
|||
// Name is the name of the member within the etcd cluster
|
||||
Name string `json:"name,omitempty"`
|
||||
|
||||
// volumeId is the id of the cloud volume (e.g. the AWS volume id)
|
||||
VolumeId string `json:"volumeId,omitempty"`
|
||||
// VolumeID is the id of the cloud volume (e.g. the AWS volume id)
|
||||
VolumeID string `json:"volumeID,omitempty"`
|
||||
}
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ func findEtcdStatus(c ALICloud, cluster *kops.Cluster) ([]kops.EtcdClusterStatus
|
|||
memberName := etcdClusterSpec.NodeName
|
||||
status.Members = append(status.Members, &kops.EtcdMemberStatus{
|
||||
Name: memberName,
|
||||
VolumeId: disk.DiskId,
|
||||
VolumeID: disk.DiskId,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ func findEtcdStatus(c AWSCloud, cluster *kops.Cluster) ([]kops.EtcdClusterStatus
|
|||
memberName := etcdClusterSpec.NodeName
|
||||
status.Members = append(status.Members, &kops.EtcdMemberStatus{
|
||||
Name: memberName,
|
||||
VolumeId: aws.StringValue(volume.VolumeId),
|
||||
VolumeID: aws.StringValue(volume.VolumeId),
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ func (c *azureCloudImplementation) findEtcdStatus(disks []compute.Disk) ([]kops.
|
|||
}
|
||||
status.Members = append(status.Members, &kops.EtcdMemberStatus{
|
||||
Name: etcdClusterSpec.NodeName,
|
||||
VolumeId: *disk.Name,
|
||||
VolumeID: *disk.Name,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -127,15 +127,15 @@ func TestFindEtcdStatus(t *testing.T) {
|
|||
expected := map[string]*kops.EtcdMemberStatus{
|
||||
"a": {
|
||||
Name: "a",
|
||||
VolumeId: "d0",
|
||||
VolumeID: "d0",
|
||||
},
|
||||
"b": {
|
||||
Name: "b",
|
||||
VolumeId: "d1",
|
||||
VolumeID: "d1",
|
||||
},
|
||||
"c": {
|
||||
Name: "c",
|
||||
VolumeId: "d2",
|
||||
VolumeID: "d2",
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -320,7 +320,7 @@ func findEtcdStatus(c *doCloudImplementation, cluster *kops.Cluster) ([]kops.Etc
|
|||
memberName := etcdClusterSpec.NodeName
|
||||
status.Members = append(status.Members, &kops.EtcdMemberStatus{
|
||||
Name: memberName,
|
||||
VolumeId: volume.ID,
|
||||
VolumeID: volume.ID,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ func (c *gceCloudImplementation) findEtcdStatus(cluster *kops.Cluster) ([]kops.E
|
|||
|
||||
status.Members = append(status.Members, &kops.EtcdMemberStatus{
|
||||
Name: etcdClusterSpec.NodeName,
|
||||
VolumeId: disk.Name,
|
||||
VolumeID: disk.Name,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ func findEtcdStatus(c OpenstackCloud, cluster *kops.Cluster) ([]kops.EtcdCluster
|
|||
memberName := etcdClusterSpec.NodeName
|
||||
status.Members = append(status.Members, &kops.EtcdMemberStatus{
|
||||
Name: memberName,
|
||||
VolumeId: volume.ID,
|
||||
VolumeID: volume.ID,
|
||||
})
|
||||
}
|
||||
var status []kops.EtcdClusterStatus
|
||||
|
|
|
|||
Loading…
Reference in New Issue