feat(k8s): add new features (#781)

Signed-off-by: Patrik Cyvoct <[email protected]>

Author: Sh4d1

docs/resources/k8s_cluster.md

@@ -138,6 +138,10 @@ The following arguments are supported:
 
     - `expendable_pods_priority_cutoff` - (Defaults to `-10`) Pods with priority below cutoff will be expendable. They can be killed without any consideration during scale down and they don't cause scale up. Pods with null priority (PodPriority disabled) are non expendable.
 
+    - `scale_down_utilization_threshold` - (Defaults to `0.5`) Node utilization level, defined as sum of requested resources divided by capacity, below which a node can be considered for scale down
+
+    - `max_graceful_termination_sec` - (Defaults to `600`) Maximum number of seconds the cluster autoscaler waits for pod termination when trying to scale down a node
+
 - `auto_upgrade` - (Optional) The auto upgrade configuration.
 
     - `enable` - (Optional) Set to `true` to enable Kubernetes patch version auto upgrades.
@@ -151,13 +155,30 @@ The following arguments are supported:
 
 - `admission_plugins` - (Optional) The list of [admission plugins](https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/) to enable on the cluster.
 
+- `apiserver_cert_sans` - (Optional) Additional Subject Alternative Names for the Kubernetes API server certificate
+
+- `open_id_connect_config` - (Optional) The OpenID Connect configuration of the cluster
+
+    - `issuer_url` - (Required) URL of the provider which allows the API server to discover public signing keys
+
+    - `client_id` - (Required) A client id that all tokens must be issued for
+
+    - `username_claim` - (Optional) JWT claim to use as the user name
+
+    - `username_prefix` - (Optional) Prefix prepended to username
+
+    - `groups_claim` - (Optional) JWT claim to use as the user's group
+
+    - `groups_prefix` - (Optional) Prefix prepended to group claims
+
+    - `required_claim` - (Optional) Multiple key=value pairs that describes a required claim in the ID Token
+
 - `delete_additional_resources` - (Defaults to `false`) Delete additional resources like block volumes and loadbalancers that were created in Kubernetes on cluster deletion.
 
 - `default_pool` - (Deprecated) See below.
 
 - `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions) in which the cluster should be created.
 
-
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the cluster is associated with.
 
 

docs/resources/k8s_pool.md

@@ -65,6 +65,17 @@ The following arguments are supported:
 - `container_runtime` - (Defaults to `docker`) The container runtime of the pool.
 ~> **Important:** Updates to this field will recreate a new resource.
 
+- `kubelet_args` - (Optional) The Kubelet arguments to be used by this pool
+
+- `upgrade_policy` - (Optional) The Pool upgrade policy
+
+    - `max_surge` - (Defaults to `0`) The maximum number of nodes to be created during the upgrade
+
+    - `max_unavailable` - (Defaults to `1`) The maximum number of nodes that can be not ready at the same time
+
+- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#regions) in which the pool should be created.
+~> **Important:** Updates to this field will recreate a new resource.
+
 - `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions) in which the pool should be created.
 
 - `wait_for_pool_ready` - (Default to `false`) Whether to wait for the pool to be ready.

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/google/go-cmp v0.5.4
 	github.com/hashicorp/go-retryablehttp v0.6.8
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210202173413-337fb17121a1
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210211085245-203deabc64c6
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1

go.sum

@@ -315,8 +315,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210202173413-337fb17121a1 h1:vytHInJpH5I4FheLyFW2wu5LmtcQOJhetm3+jaVGp74=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210202173413-337fb17121a1/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210211085245-203deabc64c6 h1:Ei7z7j+ogIz1gYYbcskXjHPorPR2Vz5XPWL9TW0lUPo=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210211085245-203deabc64c6/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=

scaleway/helpers_k8s.go

@@ -3,6 +3,7 @@ package scaleway
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -198,9 +199,31 @@ func clusterAutoscalerConfigFlatten(cluster *k8s.Cluster) []map[string]interface
 	autoscalerConfig["balance_similar_node_groups"] = cluster.AutoscalerConfig.BalanceSimilarNodeGroups
 	autoscalerConfig["expendable_pods_priority_cutoff"] = cluster.AutoscalerConfig.ExpendablePodsPriorityCutoff
 
+	// need to convert a f32 to f64 without precision loss
+	thresholdF64, err := strconv.ParseFloat(fmt.Sprintf("%f", cluster.AutoscalerConfig.ScaleDownUtilizationThreshold), 64)
+	if err != nil {
+		// should never happen
+		return nil
+	}
+	autoscalerConfig["scale_down_utilization_threshold"] = thresholdF64
+	autoscalerConfig["max_graceful_termination_sec"] = cluster.AutoscalerConfig.MaxGracefulTerminationSec
+
 	return []map[string]interface{}{autoscalerConfig}
 }
 
+func clusterOpenIDConnectConfigFlatten(cluster *k8s.Cluster) []map[string]interface{} {
+	openIDConnectConfig := map[string]interface{}{}
+	openIDConnectConfig["issuer_url"] = cluster.OpenIDConnectConfig.IssuerURL
+	openIDConnectConfig["client_id"] = cluster.OpenIDConnectConfig.ClientID
+	openIDConnectConfig["username_claim"] = cluster.OpenIDConnectConfig.UsernameClaim
+	openIDConnectConfig["username_prefix"] = cluster.OpenIDConnectConfig.UsernamePrefix
+	openIDConnectConfig["groups_claim"] = cluster.OpenIDConnectConfig.GroupsClaim
+	openIDConnectConfig["groups_prefix"] = cluster.OpenIDConnectConfig.GroupsPrefix
+	openIDConnectConfig["required_claim"] = cluster.OpenIDConnectConfig.RequiredClaim
+
+	return []map[string]interface{}{openIDConnectConfig}
+}
+
 func clusterAutoUpgradeFlatten(cluster *k8s.Cluster) []map[string]interface{} {
 	autoUpgrade := map[string]interface{}{}
 	autoUpgrade["enable"] = cluster.AutoUpgrade.Enabled
@@ -209,3 +232,33 @@ func clusterAutoUpgradeFlatten(cluster *k8s.Cluster) []map[string]interface{} {
 
 	return []map[string]interface{}{autoUpgrade}
 }
+
+func poolUpgradePolicyFlatten(pool *k8s.Pool) []map[string]interface{} {
+	upgradePolicy := map[string]interface{}{}
+	if pool.UpgradePolicy != nil {
+		upgradePolicy["max_surge"] = pool.UpgradePolicy.MaxSurge
+		upgradePolicy["max_unavailable"] = pool.UpgradePolicy.MaxUnavailable
+	}
+
+	return []map[string]interface{}{upgradePolicy}
+}
+
+func expandKubeletArgs(args interface{}) map[string]string {
+	kubeletArgs := map[string]string{}
+
+	for key, value := range args.(map[string]interface{}) {
+		kubeletArgs[key] = value.(string)
+	}
+
+	return kubeletArgs
+}
+
+func flattenKubeletArgs(args map[string]string) map[string]interface{} {
+	kubeletArgs := map[string]interface{}{}
+
+	for key, value := range args {
+		kubeletArgs[key] = value
+	}
+
+	return kubeletArgs
+}