bij1
/
gogreen
19
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #293 from digitalocean/doks-node-pool-labels 

doks: node pool labels
This commit is contained in:
Zach Gershman 2020-01-27 08:00:58 -08:00 committed by GitHub
parent 3904cef46e 12c6a483b1
commit fce6cf4fb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
kubernetes.go
View File

@ -84,24 +84,26 @@ type KubernetesClusterUpgradeRequest struct {
// KubernetesNodePoolCreateRequest represents a request to create a node pool for a
// Kubernetes cluster.
type KubernetesNodePoolCreateRequest struct {
Name string `json:"name,omitempty"`
Size string `json:"size,omitempty"`
Count int `json:"count,omitempty"`
Tags []string `json:"tags,omitempty"`
AutoScale bool `json:"auto_scale,omitempty"`
MinNodes int `json:"min_nodes,omitempty"`
MaxNodes int `json:"max_nodes,omitempty"`
Name string `json:"name,omitempty"`
Size string `json:"size,omitempty"`
Count int `json:"count,omitempty"`
Tags []string `json:"tags,omitempty"`
Labels map[string]string `json:"labels,omitempty"`
AutoScale bool `json:"auto_scale,omitempty"`
MinNodes int `json:"min_nodes,omitempty"`
MaxNodes int `json:"max_nodes,omitempty"`
}
// KubernetesNodePoolUpdateRequest represents a request to update a node pool in a
// Kubernetes cluster.
type KubernetesNodePoolUpdateRequest struct {
Name string `json:"name,omitempty"`
Count *int `json:"count,omitempty"`
Tags []string `json:"tags,omitempty"`
AutoScale *bool `json:"auto_scale,omitempty"`
MinNodes *int `json:"min_nodes,omitempty"`
MaxNodes *int `json:"max_nodes,omitempty"`
Name string `json:"name,omitempty"`
Count *int `json:"count,omitempty"`
Tags []string `json:"tags,omitempty"`
Labels map[string]string `json:"labels,omitempty"`
AutoScale *bool `json:"auto_scale,omitempty"`
MinNodes *int `json:"min_nodes,omitempty"`
MaxNodes *int `json:"max_nodes,omitempty"`
}
// KubernetesNodePoolRecycleNodesRequest is DEPRECATED please use DeleteNode
@ -297,14 +299,15 @@ type KubernetesClusterStatus struct {
// KubernetesNodePool represents a node pool in a Kubernetes cluster.
type KubernetesNodePool struct {
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Size string `json:"size,omitempty"`
Count int `json:"count,omitempty"`
Tags []string `json:"tags,omitempty"`
AutoScale bool `json:"auto_scale,omitempty"`
MinNodes int `json:"min_nodes,omitempty"`
MaxNodes int `json:"max_nodes,omitempty"`
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Size string `json:"size,omitempty"`
Count int `json:"count,omitempty"`
Tags []string `json:"tags,omitempty"`
Labels map[string]string `json:"labels,omitempty"`
AutoScale bool `json:"auto_scale,omitempty"`
MinNodes int `json:"min_nodes,omitempty"`
MaxNodes int `json:"max_nodes,omitempty"`
Nodes []*KubernetesNode `json:"nodes,omitempty"`
}

50
kubernetes_test.go
View File

@ -79,6 +79,9 @@ func TestKubernetesClusters_ListClusters(t *testing.T) {
Name: "antoine-1",
Size: "s-1vcpu-2gb",
Count: 5,
Labels: map[string]string{
"foo": "bar",
},
Nodes: []*KubernetesNode{
{
ID: "deadbeef-dead-beef-dead-deadbeefb4b1",
@ -127,6 +130,7 @@ func TestKubernetesClusters_ListClusters(t *testing.T) {
"size": "s-1vcpu-2gb",
"count": 2,
"tags": null,
"labels": null,
"nodes": [
{
"id": "",
@ -175,6 +179,9 @@ func TestKubernetesClusters_ListClusters(t *testing.T) {
"size": "s-1vcpu-2gb",
"count": 5,
"tags": null,
"labels": {
"foo": "bar"
},
"nodes": [
{
"id": "deadbeef-dead-beef-dead-deadbeefb4b1",
@ -262,6 +269,9 @@ func TestKubernetesClusters_Get(t *testing.T) {
Name: "antoine-1",
Size: "s-1vcpu-2gb",
Count: 5,
Labels: map[string]string{
"foo": "bar",
},
Nodes: []*KubernetesNode{
{
ID: "deadbeef-dead-beef-dead-deadbeefb4b1",
@ -312,6 +322,9 @@ func TestKubernetesClusters_Get(t *testing.T) {
"size": "s-1vcpu-2gb",
"count": 5,
"tags": null,
"labels": {
"foo": "bar"
},
"nodes": [
{
"id": "deadbeef-dead-beef-dead-deadbeefb4b1",
@ -481,11 +494,12 @@ func TestKubernetesClusters_Create(t *testing.T) {
VPCUUID: "880b7f98-f062-404d-b33c-458d545696f6",
NodePools: []*KubernetesNodePool{
&KubernetesNodePool{
ID: "8d91899c-0739-4a1a-acc5-deadbeefbb8a",
Size: "s-1vcpu-1gb",
Count: 2,
Name: "pool-a",
Tags: []string{"tag-1"},
ID: "8d91899c-0739-4a1a-acc5-deadbeefbb8a",
Size: "s-1vcpu-1gb",
Count: 2,
Name: "pool-a",
Tags: []string{"tag-1"},
Labels: map[string]string{"foo": "bar"},
},
},
MaintenancePolicy: &KubernetesMaintenancePolicy{
@ -505,6 +519,7 @@ func TestKubernetesClusters_Create(t *testing.T) {
Count: want.NodePools[0].Count,
Name: want.NodePools[0].Name,
Tags: want.NodePools[0].Tags,
Labels: want.NodePools[0].Labels,
AutoScale: want.NodePools[0].AutoScale,
MinNodes: want.NodePools[0].MinNodes,
MaxNodes: want.NodePools[0].MaxNodes,
@ -535,7 +550,10 @@ func TestKubernetesClusters_Create(t *testing.T) {
"name": "pool-a",
"tags": [
"tag-1"
]
],
"labels": {
"foo": "bar"
}
}
],
"maintenance_policy": {
@ -688,6 +706,9 @@ func TestKubernetesClusters_Update(t *testing.T) {
Count: 2,
Name: "pool-a",
Tags: []string{"tag-1"},
Labels: map[string]string{
"foo": "bar",
},
},
},
MaintenancePolicy: &KubernetesMaintenancePolicy{
@ -723,7 +744,10 @@ func TestKubernetesClusters_Update(t *testing.T) {
"name": "pool-a",
"tags": [
"tag-1"
]
],
"labels": {
"foo": "bar"
}
}
],
"maintenance_policy": {
@ -893,6 +917,7 @@ func TestKubernetesClusters_CreateNodePool(t *testing.T) {
Count: 2,
Name: "pool-a",
Tags: []string{"tag-1"},
Labels: map[string]string{"foo": "bar"},
AutoScale: false,
MinNodes: 0,
MaxNodes: 0,
@ -913,7 +938,10 @@ func TestKubernetesClusters_CreateNodePool(t *testing.T) {
"name": "pool-a",
"tags": [
"tag-1"
]
],
"labels": {
"foo": "bar"
}
}
}`
@ -1116,6 +1144,7 @@ func TestKubernetesClusters_UpdateNodePool(t *testing.T) {
Size: "s-1vcpu-1gb",
Count: 4,
Tags: []string{"tag-1", "tag-2"},
Labels: map[string]string{"foo": "bar"},
AutoScale: false,
MinNodes: 0,
MaxNodes: 0,
@ -1135,7 +1164,10 @@ func TestKubernetesClusters_UpdateNodePool(t *testing.T) {
"name": "a better name",
"tags": [
"tag-1", "tag-2"
]
],
"labels": {
"foo": "bar"
}
}
}`