diff --git a/CHANGELOG.md b/CHANGELOG.md index addd449..726b232 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## Unreleased + +- #255 Add DropletID to Kubernetes Node instance - @snormore + ## [v1.20.0] - 2019-09-06 - #252 Add Kubernetes autoscale config fields - @snormore diff --git a/kubernetes.go b/kubernetes.go index 5c00b8c..6271be6 100644 --- a/kubernetes.go +++ b/kubernetes.go @@ -294,9 +294,10 @@ type KubernetesNodePool struct { // KubernetesNode represents a Node in a node pool in a Kubernetes cluster. type KubernetesNode struct { - ID string `json:"id,omitempty"` - Name string `json:"name,omitempty"` - Status *KubernetesNodeStatus `json:"status,omitempty"` + ID string `json:"id,omitempty"` + Name string `json:"name,omitempty"` + Status *KubernetesNodeStatus `json:"status,omitempty"` + DropletID string `json:"droplet_id,omitempty"` CreatedAt time.Time `json:"created_at,omitempty"` UpdatedAt time.Time `json:"updated_at,omitempty"` diff --git a/kubernetes_test.go b/kubernetes_test.go index d1c697a..1e6c100 100644 --- a/kubernetes_test.go +++ b/kubernetes_test.go @@ -42,6 +42,7 @@ func TestKubernetesClusters_ListClusters(t *testing.T) { ID: "", Name: "", Status: &KubernetesNodeStatus{}, + DropletID: "droplet-1", CreatedAt: time.Date(2018, 6, 21, 8, 44, 38, 0, time.UTC), UpdatedAt: time.Date(2018, 6, 21, 8, 44, 38, 0, time.UTC), }, @@ -49,6 +50,7 @@ func TestKubernetesClusters_ListClusters(t *testing.T) { ID: "", Name: "", Status: &KubernetesNodeStatus{}, + DropletID: "droplet-2", CreatedAt: time.Date(2018, 6, 21, 8, 44, 38, 0, time.UTC), UpdatedAt: time.Date(2018, 6, 21, 8, 44, 38, 0, time.UTC), }, @@ -81,6 +83,7 @@ func TestKubernetesClusters_ListClusters(t *testing.T) { ID: "deadbeef-dead-beef-dead-deadbeefb4b1", Name: "worker-393", Status: &KubernetesNodeStatus{State: "running"}, + DropletID: "droplet-3", CreatedAt: time.Date(2018, 6, 15, 7, 10, 23, 0, time.UTC), UpdatedAt: time.Date(2018, 6, 15, 7, 11, 26, 0, time.UTC), }, @@ -88,6 +91,7 @@ func TestKubernetesClusters_ListClusters(t *testing.T) { ID: "deadbeef-dead-beef-dead-deadbeefb4b2", Name: "worker-394", Status: &KubernetesNodeStatus{State: "running"}, + DropletID: "droplet-4", CreatedAt: time.Date(2018, 6, 15, 7, 10, 23, 0, time.UTC), UpdatedAt: time.Date(2018, 6, 15, 7, 11, 26, 0, time.UTC), }, @@ -129,6 +133,7 @@ func TestKubernetesClusters_ListClusters(t *testing.T) { "status": { "state": "" }, + "droplet_id": "droplet-1", "created_at": "2018-06-21T08:44:38Z", "updated_at": "2018-06-21T08:44:38Z" }, @@ -138,6 +143,7 @@ func TestKubernetesClusters_ListClusters(t *testing.T) { "status": { "state": "" }, + "droplet_id": "droplet-2", "created_at": "2018-06-21T08:44:38Z", "updated_at": "2018-06-21T08:44:38Z" } @@ -175,15 +181,17 @@ func TestKubernetesClusters_ListClusters(t *testing.T) { "status": { "state": "running" }, + "droplet_id": "droplet-3", "created_at": "2018-06-15T07:10:23Z", "updated_at": "2018-06-15T07:11:26Z" }, { "id": "deadbeef-dead-beef-dead-deadbeefb4b2", "name": "worker-394", - "status": { - "state": "running" - }, + "status": { + "state": "running" + }, + "droplet_id": "droplet-4", "created_at": "2018-06-15T07:10:23Z", "updated_at": "2018-06-15T07:11:26Z" } @@ -234,6 +242,7 @@ func TestKubernetesClusters_Get(t *testing.T) { ID: "deadbeef-dead-beef-dead-deadbeefb4b1", Name: "worker-393", Status: &KubernetesNodeStatus{State: "running"}, + DropletID: "droplet-1", CreatedAt: time.Date(2018, 6, 15, 7, 10, 23, 0, time.UTC), UpdatedAt: time.Date(2018, 6, 15, 7, 11, 26, 0, time.UTC), }, @@ -241,6 +250,7 @@ func TestKubernetesClusters_Get(t *testing.T) { ID: "deadbeef-dead-beef-dead-deadbeefb4b2", Name: "worker-394", Status: &KubernetesNodeStatus{State: "running"}, + DropletID: "droplet-2", CreatedAt: time.Date(2018, 6, 15, 7, 10, 23, 0, time.UTC), UpdatedAt: time.Date(2018, 6, 15, 7, 11, 26, 0, time.UTC), }, @@ -284,15 +294,17 @@ func TestKubernetesClusters_Get(t *testing.T) { "status": { "state": "running" }, + "droplet_id": "droplet-1", "created_at": "2018-06-15T07:10:23Z", "updated_at": "2018-06-15T07:11:26Z" }, { "id": "deadbeef-dead-beef-dead-deadbeefb4b2", "name": "worker-394", - "status": { - "state": "running" - }, + "status": { + "state": "running" + }, + "droplet_id": "droplet-2", "created_at": "2018-06-15T07:10:23Z", "updated_at": "2018-06-15T07:11:26Z" }