Merge pull request #35 from kairen/bump-k8s-version

Bump Kubernetes version to 1.13.12 as default
getamis · Nov 15, 2019 · 6f00017 · 6f00017
2 parents da1fcd3 + 2ad1ffd
commit 6f00017
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 76 deletions.
diff --git a/VARIABLES.md b/VARIABLES.md
@@ -117,7 +117,7 @@
 | extra\_tags | (Optional) Extra AWS tags to be applied to the resources. | map | `<map>` | no |
 | hostzone | (Optional) The cluster private hostname. If not specified, <cluster name>.com will be used. | string | `""` | no |
 | kubelet\_flag\_extra\_flags | Extra user-provided flags to kubelet. | list | `<list>` | no |
-| kubernetes\_version | (Optional) Desired Kubernetes master version. If you do not specify a value, the latest available version is used. | string | `"v1.13.4"` | no |
+| kubernetes\_version | (Optional) Desired Kubernetes master version. If you do not specify a value, the latest available version is used. | string | `"v1.13.12"` | no |
 | lb\_security\_group\_ids | (Optional) List of security group IDs for the cross-account elastic network interfaces     to use to allow communication to the kubernetes api server load balancer. | list | `<list>` | no |
 | master\_config | (Optional) Desired master nodes configuration. | map | `<map>` | no |
 | name | (Required) Name of the cluster. | string | n/a | yes |
@@ -156,7 +156,7 @@
 | kube\_node\_taints | Register the node with the given list of taints ("<key>=<value>:<effect>"). | list | `<list>` | no |
 | kube\_service\_cidr |  | string | n/a | yes |
 | kubelet\_flag\_extra\_flags | Extra user-provided flags to kubelet. | list | `<list>` | no |
-| kubernetes\_version | Desired Kubernetes kubelet version. If you do not specify a value, the latest available version is used. | string | `"v1.13.4"` | no |
+| kubernetes\_version | Desired Kubernetes kubelet version. If you do not specify a value, the latest available version is used. | string | `"v1.13.12"` | no |
 | load\_balancer\_ids | A list of elastic load balancer names to add to the autoscaling group names. Only valid for classic load balancers. For ALBs, use target_group_arns instead. | list | `<list>` | no |
 | reboot\_strategy | CoreOS reboot strategies on updates, two option here: etcd-lock or off | string | `"etcd-lock"` | no |
 | role\_name | The Amazon Resource Name of the IAM role that provides permissions for the Kubernetes control plane to make calls to AWS API operations on your behalf. | string | `""` | no |

diff --git a/examples/aws-iam-authenticator/main.tf b/examples/aws-iam-authenticator/main.tf
@@ -1,9 +1,9 @@
 locals {
-  project      = "elastikube"
-  phase        = "auth"
-  cluster_name = "${local.phase}-${local.project}"
-  hostzone     = "${local.cluster_name}.cluster"
-  kubernetes_version = "v1.13.4"
+  project            = "elastikube"
+  phase              = "auth"
+  cluster_name       = "${local.phase}-${local.project}"
+  hostzone           = "${local.cluster_name}.cluster"
+  kubernetes_version = "v1.13.12"
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/examples/elastikube-cluster/main.tf b/examples/elastikube-cluster/main.tf
@@ -1,7 +1,7 @@
 locals {
   cluster_name = "${var.phase}-${var.project}"
 
-  kubernetes_version = "v1.13.4"
+  kubernetes_version = "v1.13.12"
 }
 
 provider "aws" {
@@ -61,7 +61,7 @@ module "kubernetes" {
   private_subnet_ids     = ["${module.network.private_subnet_ids}"]
   public_subnet_ids      = ["${module.network.public_subnet_ids}"]
   ssh_key                = "${var.key_pair_name}"
-  reboot_strategy    = "off"
+  reboot_strategy        = "off"
 
   extra_tags = "${merge(map(
       "Phase", "${var.phase}",

diff --git a/examples/elastikube-cluster/variables.tf b/examples/elastikube-cluster/variables.tf
@@ -22,19 +22,19 @@ variable "key_pair_name" {
 }
 
 variable "project" {
-  type = "string"
-  default = "elastikube"
-  description = "(Optional) project name, used to compose the resource name"  
+  type        = "string"
+  default     = "elastikube"
+  description = "(Optional) project name, used to compose the resource name"
 }
 
 variable "phase" {
-  type = "string"
-  default = "test"
+  type        = "string"
+  default     = "test"
   description = "(Optional) phase name, used to compose the resource name"
 }
 
 variable "endpoint_public_access" {
-  default = false
+  default     = false
   description = "(Optional) kubernetes apiserver endpoint"
 }
 

diff --git a/modules/aws/elastikube/variables.tf b/modules/aws/elastikube/variables.tf
@@ -56,13 +56,13 @@ EOF
 }
 
 variable "endpoint_public_access" {
-  default = false
+  default     = false
   description = "(Optional) kubernetes apiserver endpoint"
 }
 
 variable "kubernetes_version" {
   type        = "string"
-  default     = "v1.13.4"
+  default     = "v1.13.12"
   description = "(Optional) Desired Kubernetes master version. If you do not specify a value, the latest available version is used."
 }
 
@@ -94,6 +94,7 @@ variable "master_config" {
 
   description = "(Optional) Desired master nodes configuration."
 }
+
 variable "etcd_config" {
   type = "map"
 
@@ -139,8 +140,8 @@ variable "hostzone" {
 }
 
 variable "reboot_strategy" {
-  type    = "string"
-  default = "off"
+  type        = "string"
+  default     = "off"
   description = "(Optional) CoreOS reboot strategies on updates, two option here: etcd-lock or off"
 }
 
@@ -208,15 +209,17 @@ variable "audit_policy_path" {
 }
 
 variable "audit_log_backend" {
-  type        = "map"
-  default     = {
+  type = "map"
+
+  default = {
     path      = ""
     maxage    = ""
     maxbackup = ""
     maxsize   = ""
   }
+
   description = <<EOF
     (Optional) Kubernetes apiserver auditing log backend configuration,
     there are four parameters: path, maxage, maxbackup, maxsize.
 EOF
-}
+}
diff --git a/modules/aws/kube-master/variables.tf b/modules/aws/kube-master/variables.tf
@@ -67,13 +67,13 @@ EOF
 }
 
 variable "endpoint_public_access" {
-  default = false
+  default     = false
   description = "(Optional) kubernetes apiserver endpoint"
 }
 
 variable "kubernetes_version" {
   type        = "string"
-  default     = "v1.13.4"
+  default     = "v1.13.12"
   description = "(Optional) Desired Kubernetes master version. If you do not specify a value, the latest available version is used."
 }
 
@@ -163,7 +163,7 @@ EOF
 }
 
 variable "reboot_strategy" {
-  type    = "string"
+  type        = "string"
   description = "(Optional) CoreOS reboot strategies on updates, two option here: etcd-lock or off"
 }
 
@@ -204,10 +204,11 @@ variable "audit_policy_path" {
 }
 
 variable "audit_log_backend" {
-  type        = "map"
-  default     = {}
+  type    = "map"
+  default = {}
+
   description = <<EOF
     (Optional) Kubernetes apiserver auditing log backend configuration,
     there are four parameters: path, maxage, maxbackup, maxsize.
 EOF
-}
+}
diff --git a/modules/aws/kube-worker/variables.tf b/modules/aws/kube-worker/variables.tf
@@ -44,7 +44,7 @@ EOF
 
 variable "kubernetes_version" {
   type        = "string"
-  default     = "v1.13.4"
+  default     = "v1.13.12"
   description = "Desired Kubernetes kubelet version. If you do not specify a value, the latest available version is used."
 }
 
@@ -105,8 +105,8 @@ EOF
 }
 
 variable "reboot_strategy" {
-  type    = "string"
-  default = "etcd-lock"
+  type        = "string"
+  default     = "etcd-lock"
   description = "CoreOS reboot strategies on updates, two option here: etcd-lock or off"
 }
 

diff --git a/modules/ignitions/kube-addon-manager/variables.tf b/modules/ignitions/kube-addon-manager/variables.tf
@@ -3,7 +3,7 @@ variable "hyperkube" {
 
   default = {
     image_path = "gcr.io/google-containers/hyperkube-amd64"
-    image_tag  = "v1.13.4"
+    image_tag  = "v1.13.12"
   }
 
   description = "(Optional) The hyperkube container image path and tag."

diff --git a/modules/ignitions/kube-addon-proxy/variables.tf b/modules/ignitions/kube-addon-proxy/variables.tf
@@ -3,7 +3,7 @@ variable "hyperkube" {
 
   default = {
     image_path = "gcr.io/google-containers/hyperkube-amd64"
-    image_tag  = "v1.13.4"
+    image_tag  = "v1.13.12"
   }
 
   description = "(Optional) The hyperkube container image path and tag."

diff --git a/modules/ignitions/kube-control-plane/variables.tf b/modules/ignitions/kube-control-plane/variables.tf
@@ -20,19 +20,15 @@ variable "kube_certs" {
   type = "map"
 
   default = {
-    # ca_cert_pem        = ""
-    # apiserver_key_pem  = ""
-    # apiserver_cert_pem = ""
+    # ca_cert_pem        = ""  # apiserver_key_pem  = ""  # apiserver_cert_pem = ""
   }
 }
 
 variable "etcd_certs" {
   type = "map"
 
   default = {
-    # ca_cert_pem     = ""
-    # client_key_pem  = ""
-    # client_cert_pem = ""
+    # ca_cert_pem     = ""  # client_key_pem  = ""  # client_cert_pem = ""
   }
 }
 
@@ -60,11 +56,10 @@ variable "apiserver_config" {
 }
 
 variable "audit_log_backend" {
-  type = "map"
+  type    = "map"
   default = {}
 }
 
-
 variable "cloud_provider" {
   type = "map"
 
@@ -95,7 +90,7 @@ variable "hyperkube" {
 
   default = {
     image_path = "gcr.io/google-containers/hyperkube-amd64"
-    image_tag  = "v1.13.4"
+    image_tag  = "v1.13.12"
   }
 
   description = "The hyperkube container image path and tag"

diff --git a/modules/ignitions/kubelet/variables.tf b/modules/ignitions/kubelet/variables.tf
@@ -61,7 +61,7 @@ variable "hyperkube" {
 
   default = {
     image_path = "gcr.io/google-containers/hyperkube-amd64"
-    image_tag  = "v1.13.4"
+    image_tag  = "v1.13.12"
   }
 
   description = "(Optional) The hyperkube container image path and tag."

diff --git a/test/Gopkg.lock b/test/Gopkg.lock
diff --git a/test/Gopkg.toml b/test/Gopkg.toml
@@ -1,29 +1,7 @@
-# Gopkg.toml example
-#
-# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
 
+[[constraint]]
+  name = "k8s.io/kubernetes"
+  branch = "release-1.13"
 
 [prune]
   go-tests = true