Skip to content

Commit

Permalink
(IAC-394) [AWS] update viya4-iac-aws from k8s 1.19 to 1.21 (#119)
Browse files Browse the repository at this point in the history
* (IAC-394) [AWS] update viya4-iac-aws from k8s 1.19 to 1.21

* Updated the version from 1.21.2 to 1.21.7 for uniformity among cloud clusters
  • Loading branch information
riragh authored Jan 28, 2022
1 parent 2a2a174 commit a43782e
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG AWS_CLI_VERSION=2.1.29
FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform

FROM amazon/aws-cli:$AWS_CLI_VERSION
ARG KUBECTL_VERSION=1.19.9
ARG KUBECTL_VERSION=1.21.7

WORKDIR /viya4-iac-aws

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ The following are also required:
#### Terraform Requirements:

- [Terraform](https://www.terraform.io/downloads.html) v1.0.0
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) - v1.19.9
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) - v1.21.7
- [jq](https://stedolan.github.io/jq/) v1.6
- [AWS CLI](https://aws.amazon.com/cli) (optional; useful as an alternative to the AWS Web Console) v2.1.29

Expand Down
2 changes: 1 addition & 1 deletion docs/CONFIG-VARS.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ Custom policy:
| <div style="width:50px">Name</div> | <div style="width:150px">Description</div> | <div style="width:50px">Type</div> | <div style="width:75px">Default</div> | <div style="width:150px">Notes</div> |
| :--- | :--- | :--- | :--- | :--- |
| create_static_kubeconfig | Allows the user to create a provider- or service account-based kubeconfig file | bool | false | A value of `false` defaults to using the cloud provider's mechanism for generating the kubeconfig file. A value of `true` creates a static kubeconfig that uses a service account and cluster role binding to provide credentials. |
| kubernetes_version | The EKS cluster Kubernetes version | string | "1.19" | |
| kubernetes_version | The EKS cluster Kubernetes version | string | "1.21" | |
| create_jump_vm | Create bastion host (jump VM) | bool | true| |
| create_jump_public_ip | Add public IP address to jump VM | bool | true | |
| jump_vm_admin | OS admin user for the jump VM | string | "jumpuser" | |
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-byo.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ postgres_servers = {
}

## Cluster config
kubernetes_version = "1.19"
kubernetes_version = "1.21"
default_nodepool_node_count = 2
default_nodepool_vm_type = "m5.2xlarge"
default_nodepool_custom_data = ""
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-custom-data.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ postgres_servers = {
}

## Cluster config
kubernetes_version = "1.19"
kubernetes_version = "1.21"
default_nodepool_node_count = 2
default_nodepool_vm_type = "m5.2xlarge"
default_nodepool_custom_data = ""
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-ha.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ postgres_servers = {
ssh_public_key = "~/.ssh/id_rsa.pub"

## Cluster config
kubernetes_version = "1.19"
kubernetes_version = "1.21"
default_nodepool_node_count = 2
default_nodepool_vm_type = "m5.2xlarge"
default_nodepool_custom_data = ""
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input-minimal.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ tags = { } # e.g., { "key1" = "value1", "key2
# }

## Cluster config
kubernetes_version = "1.19"
kubernetes_version = "1.21"
default_nodepool_node_count = 1
default_nodepool_vm_type = "m5.large"
default_nodepool_custom_data = ""
Expand Down
2 changes: 1 addition & 1 deletion examples/sample-input.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ postgres_servers = {
}

## Cluster config
kubernetes_version = "1.19"
kubernetes_version = "1.21"
default_nodepool_node_count = 2
default_nodepool_vm_type = "m5.2xlarge"
default_nodepool_custom_data = ""
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ variable efs_performance_mode {
## Kubernetes
variable "kubernetes_version" {
description = "The EKS cluster Kubernetes version"
default = "1.19"
default = "1.21"
}

variable "tags" {
Expand Down

0 comments on commit a43782e

Please sign in to comment.