Feat/k8s node group anti-affinity (#206)

Author: ka-myl

CHANGELOG.md

@@ -5,6 +5,9 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+### Added
+- kubernetes: experimental support for anti-affinity node groups
+
 ## [5.3.1]
 
 ### Deprecated

upcloud/kubernetes.go

@@ -30,14 +30,15 @@ type KubernetesCluster struct {
 }
 
 type KubernetesNodeGroup struct {
-	Count       int                    `json:"count,omitempty"`
-	Labels      []Label                `json:"labels,omitempty"`
-	Name        string                 `json:"name,omitempty"`
-	Plan        string                 `json:"plan,omitempty"`
-	SSHKeys     []string               `json:"ssh_keys,omitempty"`
-	Storage     string                 `json:"storage,omitempty"`
-	KubeletArgs []KubernetesKubeletArg `json:"kubelet_args,omitempty"`
-	Taints      []KubernetesTaint      `json:"taints,omitempty"`
+	Count        int                    `json:"count,omitempty"`
+	Labels       []Label                `json:"labels,omitempty"`
+	Name         string                 `json:"name,omitempty"`
+	Plan         string                 `json:"plan,omitempty"`
+	SSHKeys      []string               `json:"ssh_keys,omitempty"`
+	Storage      string                 `json:"storage,omitempty"`
+	KubeletArgs  []KubernetesKubeletArg `json:"kubelet_args,omitempty"`
+	Taints       []KubernetesTaint      `json:"taints,omitempty"`
+	AntiAffinity bool                   `json:"anti_affinity,omitempty"`
 }
 
 type KubernetesKubeletArg struct {

upcloud/kubernetes_test.go

@@ -19,6 +19,7 @@ const exampleKubernetesClusterJSON string = `{
 			"name": "upcloud-go-sdk-unit-test",
 			"plan": "K8S-2xCPU-4GB",
 			"count": 1,
+			"anti_affinity": true,
 			"labels": [
 				{
 					"key": "managedBy",
@@ -44,6 +45,7 @@ const exampleKubernetesClusterJSON string = `{
 			"name": "upcloud-go-sdk-unit-test",
 			"plan": "K8S-2xCPU-4GB",
 			"count": 1,
+			"anti_affinity": false,
 			"labels": [
 				{
 					"key": "managedBy",
@@ -95,16 +97,16 @@ func exampleKubernetesCluster() KubernetesCluster {
 		Network:     "03a98be3-7daa-443f-bb25-4bc6854b396c",
 		NetworkCIDR: "172.16.0.0/24",
 		NodeGroups: []KubernetesNodeGroup{
-			exampleKubernetesNodeGroup(),
-			exampleKubernetesNodeGroup(),
+			exampleKubernetesNodeGroup(true),
+			exampleKubernetesNodeGroup(false),
 		},
 		State: KubernetesClusterStateRunning,
 		UUID:  "0ddab8f4-97c0-4222-91ba-85a4fff7499b",
 		Zone:  "de-fra1",
 	}
 }
 
-func exampleKubernetesNodeGroup() KubernetesNodeGroup {
+func exampleKubernetesNodeGroup(antiAffinity bool) KubernetesNodeGroup {
 	return KubernetesNodeGroup{
 		Count: 1,
 		Labels: []Label{
@@ -113,8 +115,9 @@ func exampleKubernetesNodeGroup() KubernetesNodeGroup {
 				Value: "upcloud-go-sdk-unit-test",
 			},
 		},
-		Name: "upcloud-go-sdk-unit-test",
-		Plan: "K8S-2xCPU-4GB",
+		Name:         "upcloud-go-sdk-unit-test",
+		AntiAffinity: antiAffinity,
+		Plan:         "K8S-2xCPU-4GB",
 		KubeletArgs: []KubernetesKubeletArg{
 			{
 				Key:   "somekubeletkey",

upcloud/request/kubernetes.go

@@ -114,14 +114,15 @@ func (r *GetKubernetesNodeGroupRequest) RequestURL() string {
 }
 
 type KubernetesNodeGroup struct {
-	Count       int                            `json:"count,omitempty"`
-	Labels      []upcloud.Label                `json:"labels,omitempty"`
-	Name        string                         `json:"name,omitempty"`
-	Plan        string                         `json:"plan,omitempty"`
-	SSHKeys     []string                       `json:"ssh_keys,omitempty"`
-	Storage     string                         `json:"storage,omitempty"`
-	KubeletArgs []upcloud.KubernetesKubeletArg `json:"kubelet_args,omitempty"`
-	Taints      []upcloud.KubernetesTaint      `json:"taints,omitempty"`
+	Count        int                            `json:"count,omitempty"`
+	Labels       []upcloud.Label                `json:"labels,omitempty"`
+	Name         string                         `json:"name,omitempty"`
+	Plan         string                         `json:"plan,omitempty"`
+	SSHKeys      []string                       `json:"ssh_keys,omitempty"`
+	Storage      string                         `json:"storage,omitempty"`
+	KubeletArgs  []upcloud.KubernetesKubeletArg `json:"kubelet_args,omitempty"`
+	Taints       []upcloud.KubernetesTaint      `json:"taints,omitempty"`
+	AntiAffinity bool                           `json:"anti_affinity,omitempty"`
 }
 
 type CreateKubernetesNodeGroupRequest struct {

upcloud/request/kubernetes_test.go

@@ -240,6 +240,7 @@ func TestCreateKubernetesNodeGroupRequest(t *testing.T) {
 	const expectedJSON string = `
 	{
 		"count": 4,
+		"anti_affinity": true,
 		"kubelet_args": [
 		  {
 			"key": "log-flush-frequency",
@@ -270,7 +271,8 @@ func TestCreateKubernetesNodeGroupRequest(t *testing.T) {
 	r := CreateKubernetesNodeGroupRequest{
 		ClusterUUID: "id",
 		NodeGroup: KubernetesNodeGroup{
-			Count: 4,
+			Count:        4,
+			AntiAffinity: true,
 			Labels: []upcloud.Label{
 				{
 					Key:   "environment",