From 360ae5f5542bbce6044c89fbc95bed336b101a35 Mon Sep 17 00:00:00 2001 From: Alex Hsu Date: Thu, 19 Sep 2024 13:03:56 +0800 Subject: [PATCH] FEATURE: Upgrade k8s version to 1.31.0 (#188) **Before submitting a pull request**, please make sure the following is done: ### Checklist - [ ] Fork [the repository](https://github.com/getamis/vishwakarma) and create your new branch from `master`. - [ ] Please mention the name of community in Pull Request title. - [ ] Git Commit Messages - [ ] Use the present tense (Also in Pull Request title): "Add feature" not "Added feature" - [ ] Use the imperative mood (Also in Pull Request title): "Move cursor to..." not "Moves cursor to..." - [ ] Use rebase to squash/fixup dummy/unnecessary commits into only one commit. --- README.md | 16 +++++++-------- docs/variables/aws/elastikube.md | 2 +- docs/variables/aws/kube-worker.md | 20 +++++++++---------- examples/kubernetes-cluster-aws-vpc/main.tf | 6 +++--- .../kubernetes-cluster-aws-vpc/variables.tf | 2 +- .../kubernetes-cluster-cilium-vxlan/main.tf | 6 +++--- .../variables.tf | 2 +- modules/aws/elastikube/variables.tf | 2 +- modules/aws/iam-authenticator/main.tf | 2 +- modules/aws/irsa/main.tf | 2 +- modules/aws/kube-etcd/ignition.tf | 14 ++++++------- modules/aws/kube-master/ignition.tf | 17 ++++++++-------- modules/aws/kube-master/main.tf | 2 +- modules/aws/kube-master/variables.tf | 2 +- modules/aws/kube-worker/ignition.tf | 16 +++++++-------- modules/aws/kube-worker/main.tf | 2 +- modules/aws/kube-worker/variables.tf | 2 +- 17 files changed, 57 insertions(+), 58 deletions(-) diff --git a/README.md b/README.md index bcae9c4..e9851c1 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Vishwakarma can be used to create a Kubernetes cluster in AWS by leveraging Hash ## Features -* Kubernetes v1.27.2+. +* Kubernetes v1.31.0+. * Supported [AWS VPC CNI](https://github.com/aws/amazon-vpc-cni-k8s), [flannel](https://github.com/coreos/flannel), [cilium](https://cilium.io/) networking. * RBAC-enabled, Audit log, and etcd data encryption. * etcd v3.5.0+. @@ -16,7 +16,7 @@ Vishwakarma can be used to create a Kubernetes cluster in AWS by leveraging Hash - **Terraform**: All of the AWS resource will be create by Terraform, hence, you need to [**install it**](https://www.terraform.io/intro/getting-started/install.html) and confirm the [**permission setup**](https://www.terraform.io/docs/providers/aws/index.html) correctly, then Terraform have the permission to create AWS resource automatically. **Minimum required version of Terraform is v1.2.0**. -- **kubectl**: After the cluster created completely, there is a Kubernetes ConfigMap aws-auth need to be created through kubectl, so need to [**install it**](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl). **Minimum required version of Kubernetes is v1.27.0**. +- **kubectl**: After the cluster created completely, there is a Kubernetes ConfigMap aws-auth need to be created through kubectl, so need to [**install it**](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl). **Minimum required version of Kubernetes is v1.31.0**. - **[aws-iam-authenticator](https://docs.aws.amazon.com/zh_tw/eks/latest/userguide/install-aws-iam-authenticator.html)**: The clsuter access permission integrate with AWS IAM, in order to let the cluster know whether you have the right to access, aws-iam-authenticator need to be [**installed**](https://docs.aws.amazon.com/eks/latest/userguide/configure-kubectl.html) in the client side. @@ -74,12 +74,12 @@ $ export KUBECONFIG=#{The Path You Put kubeconfig}/kubeconfig $ kubectl get node NAME STATUS ROLES AGE VERSION -ip-10-0-48-247.ec2.internal Ready master 9m v1.27.2 -ip-10-0-48-117.ec2.internal Ready master 9m v1.27.2 -ip-10-0-66-127.ec2.internal Ready on-demand 5m v1.27.2 -ip-10-0-66-127.ec2.internal Ready on-demand 6m v1.27.2 -ip-10-0-71-121.ec2.internal Ready spot 3m v1.27.2 -ip-10-0-86-182.ec2.internal Ready spot 4m v1.27.2 +ip-10-0-48-247.ec2.internal Ready master 9m v1.31.0 +ip-10-0-48-117.ec2.internal Ready master 9m v1.31.0 +ip-10-0-66-127.ec2.internal Ready on-demand 5m v1.31.0 +ip-10-0-66-127.ec2.internal Ready on-demand 6m v1.31.0 +ip-10-0-71-121.ec2.internal Ready spot 3m v1.31.0 +ip-10-0-86-182.ec2.internal Ready spot 4m v1.31.0 ``` ## What’s Going On? diff --git a/docs/variables/aws/elastikube.md b/docs/variables/aws/elastikube.md index 4d9fd17..ae2458c 100644 --- a/docs/variables/aws/elastikube.md +++ b/docs/variables/aws/elastikube.md @@ -85,7 +85,7 @@ This document gives an overview of variables used in the AWS platform of the ela | [kubelet\_extra\_config](#input\_kubelet\_extra\_config) | The user-provided configs to kubelet. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information. | `map` | `{}` | no | | [kubelet\_node\_labels](#input\_kubelet\_node\_labels) | Labels to add when registering the node in the cluster. Labels must be key=value pairs. | `list(string)` | `[]` | no | | [kubelet\_node\_taints](#input\_kubelet\_node\_taints) | Register the node with the given list of taints ("=:"). | `list(string)` | `[]` | no | -| [kubernetes\_version](#input\_kubernetes\_version) | Desired Kubernetes version. | `string` | `"v1.27.7"` | no | +| [kubernetes\_version](#input\_kubernetes\_version) | Desired Kubernetes version. | `string` | `"v1.31.0"` | no | | [lb\_security\_group\_ids](#input\_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(string)` | `[]` | no | | [log\_level](#input\_log\_level) | Log level and verbosity of each components | 
object({
    aws_cloud_controller_manager = optional(string, "2")       # 2: Info, 3: Extended Info, 4: Debug, 5: Trace
    aws_vpc_cni                  = optional(string, "DEBUG")   # DEBUG, INFO, WARN, ERROR, FATAL
    containerd                   = optional(string, "info")    # trace, debug, info, warn, error, fatal, panic
    cilium_cni                   = optional(string, "DEBUG")   # DEBUG: enable debug logging, INFO: disable debug logging
    docker                       = optional(string, "info")    # debug, info, warn, error, fatal
    etcd                         = optional(string, "info")    # debug, info, warn, error, panic, fatal
    kube_apiserver               = optional(string, "2")       # 2: Info, 3: Extended Info, 4: Debug, 5: Trace
    kube_controller_manager      = optional(string, "2")       # 2: Info, 3: Extended Info, 4: Debug, 5: Trace
    kube_scheduler               = optional(string, "2")       # 2: Info, 3: Extended Info, 4: Debug, 5: Trace
    kube_proxy                   = optional(string, "2")       # 2: Info, 3: Extended Info, 4: Debug, 5: Trace
    kubelet                      = optional(string, "2")       # 2: Info, 3: Extended Info, 4: Debug, 5: Trace
    systemd_networkd             = optional(string, "warning") # emerg, alert, crit, err, warning, notice, info, debug
  })
| 
{
  "aws_cloud_controller_manager": "2",
  "aws_vpc_cni": "DEBUG",
  "cilium_cni": "DEBUG",
  "containerd": "info",
  "docker": "info",
  "etcd": "info",
  "kube_apiserver": "2",
  "kube_controller_manager": "2",
  "kube_proxy": "2",
  "kube_scheduler": "2",
  "kubelet": "2",
  "systemd_networkd": "warning"
}
| no | | [master\_instance\_config](#input\_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

    default_cooldown          = number
    health_check_grace_period = number

    suspended_processes = list(string)

    instance_refresh       = bool
    instance_warmup        = number
    min_healthy_percentage = number

    on_demand_base_capacity                  = number
    on_demand_percentage_above_base_capacity = number
    spot_instance_pools                      = number
    spot_allocation_strategy                 = string
  })
| 
{
  "count": 1,
  "default_cooldown": 300,
  "ec2_type": [
    "t3.medium",
    "t2.medium"
  ],
  "health_check_grace_period": 300,
  "image_id": "ami-0b75e2f157200889f",
  "instance_refresh": false,
  "instance_warmup": 30,
  "min_healthy_percentage": 100,
  "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_allocation_strategy": "lowest-price",
  "spot_instance_pools": 1,
  "suspended_processes": []
}
| no | diff --git a/docs/variables/aws/kube-worker.md b/docs/variables/aws/kube-worker.md index d3b7155..3455740 100644 --- a/docs/variables/aws/kube-worker.md +++ b/docs/variables/aws/kube-worker.md @@ -19,15 +19,15 @@ This document gives an overview of variables used in the AWS platform of the kub | Name | Source | Version | |------|--------|---------| -| [ignition\_containerd](#module\_ignition\_containerd) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/containerd | v1.27.4.0 | -| [ignition\_docker](#module\_ignition\_docker) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/docker | v1.27.4.0 | -| [ignition\_ecr\_credentail\_provider](#module\_ignition\_ecr\_credentail\_provider) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/ecr-credential-provider | v1.27.4.0 | -| [ignition\_kubelet](#module\_ignition\_kubelet) | git::ssh://git@github.com/getamis/terraform-ignition-kubernetes//modules/kubelet | v1.27.7.1 | -| [ignition\_locksmithd](#module\_ignition\_locksmithd) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd | v1.27.4.0 | -| [ignition\_sshd](#module\_ignition\_sshd) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/sshd | v1.27.4.0 | -| [ignition\_systemd\_networkd](#module\_ignition\_systemd\_networkd) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/systemd-networkd | v1.27.4.0 | -| [ignition\_update\_ca\_certificates](#module\_ignition\_update\_ca\_certificates) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/update-ca-certificates | v1.27.4.0 | -| [lifecycle\_hook](#module\_lifecycle\_hook) | git::ssh://git@github.com/getamis/terraform-aws-asg-lifecycle//modules/kubernetes | v1.27.4.0 | +| [ignition\_containerd](#module\_ignition\_containerd) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/containerd | v1.31.0.0 | +| [ignition\_docker](#module\_ignition\_docker) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/docker | v1.31.0.0 | +| [ignition\_ecr\_credentail\_provider](#module\_ignition\_ecr\_credentail\_provider) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/ecr-credential-provider | v1.31.0.0 | +| [ignition\_kubelet](#module\_ignition\_kubelet) | git::ssh://git@github.com/getamis/terraform-ignition-kubernetes//modules/kubelet | v1.31.0.0 | +| [ignition\_locksmithd](#module\_ignition\_locksmithd) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd | v1.31.0.0 | +| [ignition\_sshd](#module\_ignition\_sshd) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/sshd | v1.31.0.0 | +| [ignition\_systemd\_networkd](#module\_ignition\_systemd\_networkd) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/systemd-networkd | v1.31.0.0 | +| [ignition\_update\_ca\_certificates](#module\_ignition\_update\_ca\_certificates) | git::ssh://git@github.com/getamis/terraform-ignition-reinforcements//modules/update-ca-certificates | v1.31.0.0 | +| [lifecycle\_hook](#module\_lifecycle\_hook) | git::ssh://git@github.com/getamis/terraform-aws-asg-lifecycle//modules/kubernetes | v1.31.0.0 | ## Resources @@ -75,7 +75,7 @@ This document gives an overview of variables used in the AWS platform of the kub | [kubelet\_flags](#input\_kubelet\_flags) | The flags of kubelet. The variables need to follow https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/. Do not use underline. | `map(string)` | `{}` | no | | [kubelet\_node\_labels](#input\_kubelet\_node\_labels) | Labels to add when registering the node in the cluster. Labels must be key=value pairs. | `list(string)` | `[]` | no | | [kubelet\_node\_taints](#input\_kubelet\_node\_taints) | Register the node with the given list of taints ("=:"). | `list(string)` | `[]` | no | -| [kubernetes\_version](#input\_kubernetes\_version) | Desired Kubernetes version. | `string` | `"v1.27.7"` | no | +| [kubernetes\_version](#input\_kubernetes\_version) | Desired Kubernetes version. | `string` | `"v1.31.0"` | no | | [log\_level](#input\_log\_level) | Log level and verbosity of each components | 
object({
    containerd       = optional(string, "info")    # trace, debug, info, warn, error, fatal, panic
    docker           = optional(string, "info")    # debug, info, warn, error, fatal
    kubelet          = optional(string, "2")       # 2: Info, 3: Extended Info, 4: Debug, 5: Trace
    systemd_networkd = optional(string, "warning") # emerg, alert, crit, err, warning, notice, info, debug
  })
| 
{
  "containerd": "info",
  "docker": "info",
  "kubelet": "2",
  "systemd_networkd": "warning"
}
| no | | [max\_pods](#input\_max\_pods) | (Optional) the max pod number in the node when enable eni prefix | `string` | `"110"` | no | | [name](#input\_name) | (Required) Name of the cluster. | `string` | n/a | yes | diff --git a/examples/kubernetes-cluster-aws-vpc/main.tf b/examples/kubernetes-cluster-aws-vpc/main.tf index 9356ae5..5768630 100644 --- a/examples/kubernetes-cluster-aws-vpc/main.tf +++ b/examples/kubernetes-cluster-aws-vpc/main.tf @@ -28,7 +28,7 @@ locals { module "os_ami" { source = "../../modules/aws/os-ami" flavor = "flatcar" - flatcar_version = "3602.2.1" + flatcar_version = "3815.2.5" } # --------------------------------------------------------------------------------------------------------------------- @@ -126,7 +126,7 @@ module "worker_on_demand" { name = "on-demand" count = 1 max_count = null - image_id = "ami-0b8fef69b7bf66b89" + image_id = module.os_ami.image_id ec2_type = [ "t3.medium", "t2.medium" @@ -194,7 +194,7 @@ module "worker_spot" { instance_config = { name = "spot" - image_id = "ami-0b8fef69b7bf66b89" + image_id = module.os_ami.image_id count = 1 max_count = 10 ec2_type = [ diff --git a/examples/kubernetes-cluster-aws-vpc/variables.tf b/examples/kubernetes-cluster-aws-vpc/variables.tf index 422b601..1dbd812 100644 --- a/examples/kubernetes-cluster-aws-vpc/variables.tf +++ b/examples/kubernetes-cluster-aws-vpc/variables.tf @@ -7,7 +7,7 @@ variable "aws_region" { variable "kubernetes_version" { description = "Desired Kubernetes version." type = string - default = "v1.27.7" + default = "v1.31.0" } variable "service_cidr" { diff --git a/examples/kubernetes-cluster-cilium-vxlan/main.tf b/examples/kubernetes-cluster-cilium-vxlan/main.tf index 6fdc3af..4db871e 100644 --- a/examples/kubernetes-cluster-cilium-vxlan/main.tf +++ b/examples/kubernetes-cluster-cilium-vxlan/main.tf @@ -28,7 +28,7 @@ locals { module "os_ami" { source = "../../modules/aws/os-ami" flavor = "flatcar" - flatcar_version = "3602.2.1" + flatcar_version = "3815.2.5" } # --------------------------------------------------------------------------------------------------------------------- @@ -123,7 +123,7 @@ module "worker_on_demand" { name = "on-demand" count = 1 max_count = null - image_id = "ami-0b8fef69b7bf66b89" + image_id = module.os_ami.image_id ec2_type = [ "t3.medium", "t2.medium" @@ -190,7 +190,7 @@ module "worker_spot" { instance_config = { name = "spot" - image_id = "ami-0b8fef69b7bf66b89" + image_id = module.os_ami.image_id count = 1 max_count = 10 ec2_type = [ diff --git a/examples/kubernetes-cluster-cilium-vxlan/variables.tf b/examples/kubernetes-cluster-cilium-vxlan/variables.tf index 31eea41..6522cdd 100644 --- a/examples/kubernetes-cluster-cilium-vxlan/variables.tf +++ b/examples/kubernetes-cluster-cilium-vxlan/variables.tf @@ -7,7 +7,7 @@ variable "aws_region" { variable "kubernetes_version" { description = "Desired Kubernetes version." type = string - default = "v1.27.7" + default = "v1.31.0" } variable "service_cidr" { diff --git a/modules/aws/elastikube/variables.tf b/modules/aws/elastikube/variables.tf index 3b270be..fa73062 100644 --- a/modules/aws/elastikube/variables.tf +++ b/modules/aws/elastikube/variables.tf @@ -6,7 +6,7 @@ variable "name" { variable "kubernetes_version" { description = "Desired Kubernetes version." type = string - default = "v1.27.7" + default = "v1.31.0" } variable "override_binaries" { diff --git a/modules/aws/iam-authenticator/main.tf b/modules/aws/iam-authenticator/main.tf index 5f14a4c..033d06e 100644 --- a/modules/aws/iam-authenticator/main.tf +++ b/modules/aws/iam-authenticator/main.tf @@ -1,5 +1,5 @@ module "ignition_iam_auth" { - source = "github.com/getamis/terraform-ignition-kubernetes//modules/extra-addons/aws-iam-authenticator?ref=v1.27.7.0" + source = "github.com/getamis/terraform-ignition-kubernetes//modules/extra-addons/aws-iam-authenticator?ref=v1.31.0.0" cluster_name = var.name container = var.container diff --git a/modules/aws/irsa/main.tf b/modules/aws/irsa/main.tf index f2949c0..715be90 100644 --- a/modules/aws/irsa/main.tf +++ b/modules/aws/irsa/main.tf @@ -12,7 +12,7 @@ locals { data "aws_region" "current" {} module "ignition_pod_idenity_webhook" { - source = "github.com/getamis/terraform-ignition-kubernetes//modules/extra-addons/aws-pod-identity-webhook?ref=v1.27.7.0" + source = "github.com/getamis/terraform-ignition-kubernetes//modules/extra-addons/aws-pod-identity-webhook?ref=v1.31.0.0" container = var.container service_name = var.service_name diff --git a/modules/aws/kube-etcd/ignition.tf b/modules/aws/kube-etcd/ignition.tf index 7126aa7..6b9d426 100644 --- a/modules/aws/kube-etcd/ignition.tf +++ b/modules/aws/kube-etcd/ignition.tf @@ -1,38 +1,38 @@ module "ignition_docker" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.31.0.0" docker_cgroup_driver = "systemd" log_level = var.log_level["docker"] } module "ignition_containerd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/containerd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/containerd?ref=v1.31.0.0" log_level = var.log_level["containerd"] } module "ignition_locksmithd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd?ref=v1.31.0.0" reboot_strategy = var.reboot_strategy } module "ignition_update_ca_certificates" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/update-ca-certificates?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/update-ca-certificates?ref=v1.31.0.0" } module "ignition_node_exporter" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/node-exporter?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/node-exporter?ref=v1.31.0.0" } module "ignition_sshd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/sshd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/sshd?ref=v1.31.0.0" enable = var.debug_mode } module "ignition_etcd" { - source = "github.com/getamis/terraform-ignition-etcd?ref=v1.27.4.2" + source = "github.com/getamis/terraform-ignition-etcd?ref=v1.31.0.0" name = var.name containers = var.containers diff --git a/modules/aws/kube-master/ignition.tf b/modules/aws/kube-master/ignition.tf index 3333674..c391e05 100644 --- a/modules/aws/kube-master/ignition.tf +++ b/modules/aws/kube-master/ignition.tf @@ -12,8 +12,7 @@ resource "random_password" "encryption_secret" { } module "ignition_kubernetes" { - source = "github.com/getamis/terraform-ignition-kubernetes//?ref=v1.27.7.1" - + source = "github.com/getamis/terraform-ignition-kubernetes//?ref=v1.31.0.0" binaries = var.binaries containers = var.containers kubernetes_version = var.kubernetes_version @@ -95,39 +94,39 @@ module "ignition_kubernetes" { } module "ignition_docker" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.31.0.0" docker_cgroup_driver = "systemd" log_level = var.log_level["docker"] } module "ignition_containerd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/containerd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/containerd?ref=v1.31.0.0" log_level = var.log_level["containerd"] } module "ignition_locksmithd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd?ref=v1.31.0.0" reboot_strategy = var.reboot_strategy } module "ignition_update_ca_certificates" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/update-ca-certificates?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/update-ca-certificates?ref=v1.31.0.0" } module "ignition_sshd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/sshd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/sshd?ref=v1.31.0.0" enable = var.debug_mode } module "ignition_ecr_credentail_provider" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/ecr-credential-provider?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/ecr-credential-provider?ref=v1.31.0.0" } module "ignition_systemd_networkd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/systemd-networkd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/systemd-networkd?ref=v1.31.0.0" log_level = var.log_level["systemd_networkd"] } diff --git a/modules/aws/kube-master/main.tf b/modules/aws/kube-master/main.tf index be0a8fc..5bf9a9e 100644 --- a/modules/aws/kube-master/main.tf +++ b/modules/aws/kube-master/main.tf @@ -122,7 +122,7 @@ resource "aws_launch_template" "master" { module "lifecycle_hook" { count = var.enable_asg_life_cycle ? 1 : 0 - source = "github.com/getamis/terraform-aws-asg-lifecycle//modules/kubernetes?ref=v1.27.4.2" + source = "github.com/getamis/terraform-aws-asg-lifecycle//modules/kubernetes?ref=v1.31.0.0" name = "${var.name}-master" cluster_name = var.name diff --git a/modules/aws/kube-master/variables.tf b/modules/aws/kube-master/variables.tf index 416be29..10371eb 100644 --- a/modules/aws/kube-master/variables.tf +++ b/modules/aws/kube-master/variables.tf @@ -6,7 +6,7 @@ variable "name" { variable "kubernetes_version" { description = "Desired Kubernetes version." type = string - default = "v1.27.7" + default = "v1.31.0" } variable "binaries" { diff --git a/modules/aws/kube-worker/ignition.tf b/modules/aws/kube-worker/ignition.tf index 6fe50a7..923beaf 100644 --- a/modules/aws/kube-worker/ignition.tf +++ b/modules/aws/kube-worker/ignition.tf @@ -8,42 +8,42 @@ locals { } module "ignition_docker" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.31.0.0" docker_cgroup_driver = "systemd" log_level = var.log_level["docker"] } module "ignition_containerd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/containerd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/containerd?ref=v1.31.0.0" log_level = var.log_level["containerd"] } module "ignition_locksmithd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd?ref=v1.31.0.0" reboot_strategy = var.reboot_strategy } module "ignition_update_ca_certificates" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/update-ca-certificates?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/update-ca-certificates?ref=v1.31.0.0" } module "ignition_sshd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/sshd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/sshd?ref=v1.31.0.0" enable = var.debug_mode } module "ignition_systemd_networkd" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/systemd-networkd?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/systemd-networkd?ref=v1.31.0.0" log_level = var.log_level["systemd_networkd"] } module "ignition_ecr_credentail_provider" { - source = "github.com/getamis/terraform-ignition-reinforcements//modules/ecr-credential-provider?ref=v1.27.4.0" + source = "github.com/getamis/terraform-ignition-reinforcements//modules/ecr-credential-provider?ref=v1.31.0.0" } data "aws_s3_object" "bootstrapping_kubeconfig" { @@ -52,7 +52,7 @@ data "aws_s3_object" "bootstrapping_kubeconfig" { } module "ignition_kubelet" { - source = "github.com/getamis/terraform-ignition-kubernetes//modules/kubelet?ref=v1.27.7.1" + source = "github.com/getamis/terraform-ignition-kubernetes//modules/kubelet?ref=v1.31.0.0" binaries = var.binaries containers = var.containers diff --git a/modules/aws/kube-worker/main.tf b/modules/aws/kube-worker/main.tf index bd894b2..3569d15 100644 --- a/modules/aws/kube-worker/main.tf +++ b/modules/aws/kube-worker/main.tf @@ -159,7 +159,7 @@ resource "aws_launch_template" "worker" { module "lifecycle_hook" { count = var.enable_asg_life_cycle ? 1 : 0 - source = "github.com/getamis/terraform-aws-asg-lifecycle//modules/kubernetes?ref=v1.27.4.2" + source = "github.com/getamis/terraform-aws-asg-lifecycle//modules/kubernetes?ref=v1.31.0.0" name = "${var.name}-worker-${var.instance_config["name"]}" cluster_name = var.name diff --git a/modules/aws/kube-worker/variables.tf b/modules/aws/kube-worker/variables.tf index 524a188..1e3d0b8 100644 --- a/modules/aws/kube-worker/variables.tf +++ b/modules/aws/kube-worker/variables.tf @@ -6,7 +6,7 @@ variable "name" { variable "kubernetes_version" { description = "Desired Kubernetes version." type = string - default = "v1.27.7" + default = "v1.31.0" } variable "binaries" {