Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Update godo to use simplified template response and provide consistent struct naming #798

Merged
merged 1 commit into from
Mar 4, 2025
Merged

Fix: Update godo to use simplified template response and provide consistent struct naming #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ type KubernetesService interface {

CreateNodePool(ctx context.Context, clusterID string, req *KubernetesNodePoolCreateRequest) (*KubernetesNodePool, *Response, error)
GetNodePool(ctx context.Context, clusterID, poolID string) (*KubernetesNodePool, *Response, error)
GetNodePoolTemplate(ctx context.Context, clusterID string, nodePoolName string) (*KubernetesNodePoolTemplateResponse, *Response, error)
GetNodePoolTemplate(ctx context.Context, clusterID string, nodePoolName string) (*KubernetesNodePoolTemplate, *Response, error)
ListNodePools(ctx context.Context, clusterID string, opts *ListOptions) ([]*KubernetesNodePool, *Response, error)
UpdateNodePool(ctx context.Context, clusterID, poolID string, req *KubernetesNodePoolUpdateRequest) (*KubernetesNodePool, *Response, error)
// RecycleNodePoolNodes is DEPRECATED please use DeleteNode
Expand Down Expand Up @@ -435,20 +435,9 @@ type KubernetesNodePool struct {
Nodes []*KubernetesNode `json:"nodes,omitempty"`
}

// KubernetesNodePool represents a node pool template response from the node template endpoint
type KubernetesNodePoolTemplateResponse struct {
ClusterUUID string `json:"cluster_uuid,omitempty"`
Name string `json:"name,omitempty"`
Slug string `json:"slug,omitempty"`
Template *KubernetesNodePoolTemplate `json:"template,omitempty"`
}

// KubernetesNodePool represents the node pool template data for a given pool.
type KubernetesNodePoolTemplate struct {
Labels map[string]string `json:"labels,omitempty"`
Taints []string `json:"taints,omitempty"`
Capacity *KubernetesNodePoolResources `json:"capacity,omitempty"`
Allocatable *KubernetesNodePoolResources `json:"allocatable,omitempty"`
Template *KubernetesNodeTemplate
}

// KubernetesNodePoolResources represents the resources within a given template for a node pool
Expand All @@ -471,6 +460,17 @@ type KubernetesNode struct {
UpdatedAt time.Time `json:"updated_at,omitempty"`
}

// KubernetesNodeTemplate represents a template in a node pool in a Kubernetes cluster.
type KubernetesNodeTemplate struct {
ClusterUUID string `json:"cluster_uuid,omitempty"`
Name string `json:"name,omitempty"`
Slug string `json:"slug,omitempty"`
Labels map[string]string `json:"labels,omitempty"`
Taints []string `json:"taints,omitempty"`
Capacity *KubernetesNodePoolResources `json:"capacity,omitempty"`
Allocatable *KubernetesNodePoolResources `json:"allocatable,omitempty"`
}

// KubernetesNodeStatus represents the status of a particular Node in a Kubernetes cluster.
type KubernetesNodeStatus struct {
State string `json:"state,omitempty"`
Expand Down Expand Up @@ -839,7 +839,7 @@ func (svc *KubernetesServiceOp) GetNodePool(ctx context.Context, clusterID, pool
}

// GetNodePoolTemplate retrieves the template used for a given node pool to scale up from zero.
func (svc *KubernetesServiceOp) GetNodePoolTemplate(ctx context.Context, clusterID string, nodePoolName string) (*KubernetesNodePoolTemplateResponse, *Response, error) {
func (svc *KubernetesServiceOp) GetNodePoolTemplate(ctx context.Context, clusterID string, nodePoolName string) (*KubernetesNodePoolTemplate, *Response, error) {
path, err := url.JoinPath(kubernetesClustersPath, clusterID, "node_pools_template", nodePoolName)
if err != nil {
return nil, nil, err
Expand All @@ -848,7 +848,7 @@ func (svc *KubernetesServiceOp) GetNodePoolTemplate(ctx context.Context, cluster
if err != nil {
return nil, nil, err
}
root := new(KubernetesNodePoolTemplateResponse)
root := new(KubernetesNodePoolTemplate)
resp, err := svc.client.Do(ctx, req, root)
if err != nil {
return nil, resp, err
Expand Down
53 changes: 27 additions & 26 deletions kubernetes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,12 +1332,12 @@ func TestKubernetesClusters_GetNodePoolTemplate(t *testing.T) {
setup()
defer teardown()
kubeSvc := client.Kubernetes
want := &KubernetesNodePoolTemplateResponse{
ClusterUUID: "8d91899c-0739-4a1a-acc5-deadbeefbb8a",
Name: "pool-a",
Slug: "s-1vcpu-2gb",
Template: &KubernetesNodePoolTemplate{
Taints: []string{"some-key=some-value:NoSchedule"},
want := &KubernetesNodePoolTemplate{
Template: &KubernetesNodeTemplate{
ClusterUUID: "8d91899c-0739-4a1a-acc5-deadbeefbb8a",
Name: "pool-a",
Slug: "s-1vcpu-2gb",
Taints: []string{"some-key=some-value:NoSchedule"},
Labels: map[string]string{
"some-label": "some-value",
},
Expand All @@ -1350,29 +1350,30 @@ func TestKubernetesClusters_GetNodePoolTemplate(t *testing.T) {
CPU: 390,
Memory: "1024Mi",
Pods: 110,
}},
},
},
}
jBlob := `
{
"cluster_uuid": "8d91899c-0739-4a1a-acc5-deadbeefbb8a",
"name": "pool-a",
"slug": "s-1vcpu-2gb",
"template": {
"labels": {
"some-label": "some-value"
},
"taints": ["some-key=some-value:NoSchedule"],
"capacity": {
"cpu": 1,
"memory": "2048Mi",
"pods": 110
},
"allocatable": {
"cpu": 390,
"memory": "1024Mi",
"pods": 110
}
}
"template": {
"cluster_uuid": "8d91899c-0739-4a1a-acc5-deadbeefbb8a",
"name": "pool-a",
"slug": "s-1vcpu-2gb",
"labels": {
"some-label": "some-value"
},
"taints": ["some-key=some-value:NoSchedule"],
"capacity": {
"cpu": 1,
"memory": "2048Mi",
"pods": 110
},
"allocatable": {
"cpu": 390,
"memory": "1024Mi",
"pods": 110
}
}
}
`
mux.HandleFunc("/v2/kubernetes/clusters/8d91899c-0739-4a1a-acc5-deadbeefbb8a/node_pools_template/pool-a", func(w http.ResponseWriter, r *http.Request) {
Expand Down