Skip to content

resource_kubelet_pool: improvements #82

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

Merged
merged 4 commits into from
Mar 15, 2020
Merged

resource_kubelet_pool: improvements #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8e1cac
pkg/container/containersstate.go: don't export hooks
invidian Mar 15, 2020
bc3a50b
pkg/kubelet: improvements
invidian Mar 15, 2020
af342fe
terraform: kubelet pool: migrate to proper schema
invidian Mar 15, 2020
e8de3b8
terraform: remove old unused helpers
invidian Mar 15, 2020
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
96 changes: 96 additions & 0 deletions cmd/terraform-provider-flexkube/flexkube/kubelet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package flexkube

import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"

"github.com/flexkube/libflexkube/pkg/kubelet"
"github.com/flexkube/libflexkube/pkg/types"
)

func kubeletsUnmarshal(i interface{}) []kubelet.Kubelet {
j := i.([]interface{})

kubelets := []kubelet.Kubelet{}

for _, v := range j {
if v == nil {
continue
}

t := v.(map[string]interface{})

k := kubelet.Kubelet{
Image: t["image"].(string),
BootstrapKubeconfig: t["bootstrap_kubeconfig"].(string),
KubernetesCACertificate: types.Certificate(t["kubernetes_ca_certificate"].(string)),
PrivilegedLabelsKubeconfig: t["privileged_labels_kubeconfig"].(string),
CgroupDriver: t["cgroup_driver"].(string),
NetworkPlugin: t["network_plugin"].(string),
HairpinMode: t["hairpin_mode"].(string),
VolumePluginDir: t["volume_plugin_dir"].(string),
Name: t["name"].(string),
Address: t["address"].(string),
ClusterDNSIPs: stringListUnmarshal(t["cluster_dns_ips"]),
Taints: stringMapUnmarshal(t["taints"]),
Labels: stringMapUnmarshal(t["labels"]),
PrivilegedLabels: stringMapUnmarshal(t["privileged_labels"]),
SystemReserved: stringMapUnmarshal(t["system_reserved"]),
KubeReserved: stringMapUnmarshal(t["kube_reserved"]),
}

if v, ok := t["host"]; ok && len(v.([]interface{})) == 1 {
k.Host = hostUnmarshal(v.([]interface{})[0])
}

kubelets = append(kubelets, k)
}

return kubelets
}

func kubeletSchema() *schema.Schema {
return requiredList(false, false, func(computed bool) *schema.Resource {
return &schema.Resource{
Schema: map[string]*schema.Schema{
"name": requiredString(false),
"image": optionalString(false),
"host": hostSchema(false),
"address": requiredString(false),
"bootstrap_kubeconfig": optionalString(false),
"kubernetes_ca_certificate": optionalString(false),
"cluster_dns_ips": optionalStringList(false),
"taints": optionalMapPrimitive(false, func(computed bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
}
}),
"labels": optionalMapPrimitive(false, func(computed bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
}
}),
"privileged_labels": optionalMapPrimitive(false, func(computed bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
}
}),
"privileged_labels_kubeconfig": sensitiveString(false),
"cgroup_driver": optionalString(false),
"network_plugin": optionalString(false),
"system_reserved": optionalMapPrimitive(false, func(computed bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
}
}),
"kube_reserved": optionalMapPrimitive(false, func(computed bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
}
}),
"hairpin_mode": optionalString(false),
"volume_plugin_dir": optionalString(false),
"pod_cidr": optionalString(false),
},
}
})
}
92 changes: 69 additions & 23 deletions cmd/terraform-provider-flexkube/flexkube/resource_kubelet_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,83 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"

"github.com/flexkube/libflexkube/pkg/kubelet"
"github.com/flexkube/libflexkube/pkg/types"
)

func resourceKubeletPool() *schema.Resource {
return &schema.Resource{
Create: resourceKubeletPoolCreate,
Read: resourceKubeletPoolRead,
Delete: resourceKubeletPoolDelete,
Update: resourceKubeletPoolCreate,
Schema: map[string]*schema.Schema{
"config": {
Type: schema.TypeString,
Required: true,
},
"state": {
Type: schema.TypeString,
Computed: true,
},
},
Create: resourceCreate(kubeletPoolUnmarshal),
Read: resourceRead(kubeletPoolUnmarshal),
Delete: resourceDelete(kubeletPoolUnmarshal, "kubelet"),
Update: resourceCreate(kubeletPoolUnmarshal),
CustomizeDiff: resourceDiff(kubeletPoolUnmarshal),
Schema: withCommonFields(map[string]*schema.Schema{
"image": optionalString(false),
"ssh": sshSchema(false),
"bootstrap_kubeconfig": optionalString(false),
"kubernetes_ca_certificate": optionalString(false),
"cluster_dns_ips": optionalStringList(false),
"taints": optionalMapPrimitive(false, func(computed bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
}
}),
"labels": optionalMapPrimitive(false, func(computed bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
}
}),
"privileged_labels": optionalMapPrimitive(false, func(computed bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
}
}),
"privileged_labels_kubeconfig": sensitiveString(false),
"cgroup_driver": optionalString(false),
"network_plugin": optionalString(false),
"system_reserved": optionalMapPrimitive(false, func(computed bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
}
}),
"kube_reserved": optionalMapPrimitive(false, func(computed bool) *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
}
}),
"hairpin_mode": optionalString(false),
"volume_plugin_dir": optionalString(false),
"kubelet": kubeletSchema(),
}),
}
}

const resourceKubeletPoolName = "kubelet pool"
func kubeletPoolUnmarshal(d getter, includeState bool) types.ResourceConfig {
c := &kubelet.Pool{
Image: d.Get("image").(string),
BootstrapKubeconfig: d.Get("bootstrap_kubeconfig").(string),
KubernetesCACertificate: types.Certificate(d.Get("kubernetes_ca_certificate").(string)),
PrivilegedLabelsKubeconfig: d.Get("privileged_labels_kubeconfig").(string),
CgroupDriver: d.Get("cgroup_driver").(string),
NetworkPlugin: d.Get("network_plugin").(string),
HairpinMode: d.Get("hairpin_mode").(string),
VolumePluginDir: d.Get("volume_plugin_dir").(string),
Kubelets: kubeletsUnmarshal(d.Get("kubelet")),
ClusterDNSIPs: stringListUnmarshal(d.Get("cluster_dns_ips")),
Taints: stringMapUnmarshal(d.Get("taints")),
Labels: stringMapUnmarshal(d.Get("labels")),
PrivilegedLabels: stringMapUnmarshal(d.Get("privileged_labels")),
SystemReserved: stringMapUnmarshal(d.Get("system_reserved")),
KubeReserved: stringMapUnmarshal(d.Get("kube_reserved")),
}

func resourceKubeletPoolCreate(d *schema.ResourceData, m interface{}) error {
return createResource(d, &kubelet.Pool{}, resourceKubeletPoolName)
}
if includeState {
c.State = getState(d)
}

func resourceKubeletPoolRead(d *schema.ResourceData, m interface{}) error {
return readResource(d, &kubelet.Pool{}, resourceKubeletPoolName)
}
if d, ok := d.GetOk("ssh"); ok && len(d.([]interface{})) == 1 {
c.SSH = sshUnmarshal(d.([]interface{})[0])
}

func resourceKubeletPoolDelete(d *schema.ResourceData, m interface{}) error {
return deleteResource(d)
return c
}
Loading