From 1fcdb9178d19f9fb22430ec2188a7d676127747b Mon Sep 17 00:00:00 2001 From: smalltown Date: Tue, 8 Dec 2020 00:07:43 +0800 Subject: [PATCH] feat: unify binary key name --- docs/variables/aws/elastikube.md | 2 +- docs/variables/aws/kube-worker.md | 2 +- modules/aws/elastikube/variables.tf | 2 +- modules/aws/kube-master/variables.tf | 2 +- modules/aws/kube-worker/variables.tf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/variables/aws/elastikube.md b/docs/variables/aws/elastikube.md index 03c9f909..7b55f178 100644 --- a/docs/variables/aws/elastikube.md +++ b/docs/variables/aws/elastikube.md @@ -31,7 +31,7 @@ This document gives an overview of variables used in the AWS platform of the ela | master\_instance\_config | (Optional) Desired master nodes configuration. | 
object({
    count            = number
    image_id         = string
    ec2_type         = list(string)
    root_volume_iops = number
    root_volume_size = number
    root_volume_type = string

    on_demand_base_capacity                  = number
    on_demand_percentage_above_base_capacity = number
    spot_instance_pools                      = number
  })
| 
{
  "count": 1,
  "ec2_type": [
    "t3.medium",
    "t2.medium"
  ],
  "image_id": "ami-0b75e2f157200889f",
  "on_demand_base_capacity": 0,
  "on_demand_percentage_above_base_capacity": 100,
  "root_volume_iops": 100,
  "root_volume_size": 256,
  "root_volume_type": "gp2",
  "spot_instance_pools": 1
}
| | name | (Required) Name of the cluster. | `string` | n/a | | network\_plugin | Desired network plugin which is use for Kubernetes cluster. e.g. 'flannel', 'amazon-vpc' | `string` | `"amazon-vpc"` | -| override\_binaries | Desired binaries(cni\_plugin) url and checksum. | 
map(object({
    url      = string
    checksum = string
  }))
| `{}` | +| override\_binaries | Desired binaries(cni\_plugin) url and checksum. | 
map(object({
    source   = string
    checksum = string
  }))
| `{}` | | override\_containers | Desired containers(kube-apiserver, kube-controller-manager, cfssl, coredns, and so on) repo and tag. | 
map(object({
    repo = string
    tag  = string
  }))
| `{}` | | private\_subnet\_ids | (Required) List of private subnet IDs. Must be in at least two different availability zones.
Cross-account elastic network interfaces will be created in these subnets to allow
communication between your worker nodes and the Kubernetes control plane. | `list(string)` | `[]` | | public\_subnet\_ids | (Required) List of public subnet IDs. Must be in at least two different availability zones.
Cross-account elastic network interfaces will be created in these subnets to allow
communication between your worker nodes and the Kubernetes control plane. | `list(string)` | `[]` | diff --git a/docs/variables/aws/kube-worker.md b/docs/variables/aws/kube-worker.md index 5d51d16e..88883ae6 100644 --- a/docs/variables/aws/kube-worker.md +++ b/docs/variables/aws/kube-worker.md @@ -5,7 +5,7 @@ This document gives an overview of variables used in the AWS platform of the kub | Name | Description | Type | Default | |------|-------------|------|---------| -| binaries | Desired binaries(cni\_plugin) url and checksum. | 
map(object({
    url      = string
    checksum = string
  }))
| `{}` | +| binaries | Desired binaries(cni\_plugin) url and checksum. | 
map(object({
    source   = string
    checksum = string
  }))
| `{}` | | cloud\_config | The cloud provider configuration. | 
object({
    provider = string
    path     = string
  })
| 
{
  "path": "",
  "provider": ""
}
| | containers | Desired containers(kube-apiserver, kube-controller-manager, cfssl, coredns, and so on) repo and tag. | 
map(object({
    repo = string
    tag  = string
  }))
| `{}` | | enable\_autoscaler | Enable to add autoscaler tag or not | `string` | `"false"` | diff --git a/modules/aws/elastikube/variables.tf b/modules/aws/elastikube/variables.tf index 719defd1..4c10591a 100644 --- a/modules/aws/elastikube/variables.tf +++ b/modules/aws/elastikube/variables.tf @@ -12,7 +12,7 @@ variable "kubernetes_version" { variable "override_binaries" { description = "Desired binaries(cni_plugin) url and checksum." type = map(object({ - url = string + source = string checksum = string })) default = {} diff --git a/modules/aws/kube-master/variables.tf b/modules/aws/kube-master/variables.tf index 32e66d02..97b5a5ea 100644 --- a/modules/aws/kube-master/variables.tf +++ b/modules/aws/kube-master/variables.tf @@ -12,7 +12,7 @@ variable "kubernetes_version" { variable "binaries" { description = "Desired binaries(cni_plugin) url and checksum." type = map(object({ - url = string + source = string checksum = string })) default = {} diff --git a/modules/aws/kube-worker/variables.tf b/modules/aws/kube-worker/variables.tf index 14191b05..fb48c6b3 100644 --- a/modules/aws/kube-worker/variables.tf +++ b/modules/aws/kube-worker/variables.tf @@ -12,7 +12,7 @@ variable "kubernetes_version" { variable "binaries" { description = "Desired binaries(cni_plugin) url and checksum." type = map(object({ - url = string + source = string checksum = string })) default = {}