Skip to content
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

feat(rancher/aws): Bump rancher, rke2, k3s, cert-manager version #240

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(rancher/aws): Bump rancher, rke2, k3s, cert-manager version #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions rancher/aws/terraform.tfvars.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@ aws_secret_key = ""
rancher_server_admin_password = ""

# Add a windows node to the workload cluster
add_windows_node = false
#add_windows_node = false

# AWS region used for all resources
aws_region = "us-east-1"
#aws_region = "us-east-1"

# AWS session token used to create AWS infrastructure
aws_session_token = ""
#aws_session_token = ""

# AWS zone used for all resources
aws_zone = "us-east-1b"
#aws_zone = "us-east-1b"

# Version of cert-manager to install alongside Rancher (format: 0.0.0)
cert_manager_version = "1.11.0"
#cert_manager_version = "1.16.0"

# Instance type used for all EC2 instances
instance_type = "t3a.medium"
#instance_type = "t3a.medium"

# Prefix added to names of all resources
prefix = "quickstart"
#prefix = "quickstart"

# The helm repository, where the Rancher helm chart is installed from
rancher_helm_repository = "https://releases.rancher.com/server-charts/latest"
#rancher_helm_repository = "https://releases.rancher.com/server-charts/latest"

# Kubernetes version to use for Rancher server cluster
rancher_kubernetes_version = "v1.24.14+k3s1"
#rancher_kubernetes_version = "v1.30.4+k3s1"

# Rancher server version (format: v0.0.0)
rancher_version = "2.7.9"
#rancher_version = "2.9.2"

# Instance type used for all EC2 windows instances
windows_instance_type = "t3a.large"
#windows_instance_type = "t3a.large"

# Kubernetes version to use for managed workload cluster
workload_kubernetes_version = "v1.24.14+rke2r1"
#workload_kubernetes_version = "v1.30.4+rke2r1"
9 changes: 4 additions & 5 deletions rancher/aws/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,25 @@ variable "windows_instance_type" {
variable "rancher_kubernetes_version" {
type = string
description = "Kubernetes version to use for Rancher server cluster"
default = "v1.24.14+k3s1"
default = "v1.30.4+k3s1"
}

variable "workload_kubernetes_version" {
type = string
description = "Kubernetes version to use for managed workload cluster"
default = "v1.24.14+rke2r1"
default = "v1.30.4+rke2r1"
}

variable "cert_manager_version" {
type = string
description = "Version of cert-manager to install alongside Rancher (format: 0.0.0)"
default = "1.11.0"
default = "1.16.0"
}

variable "rancher_version" {
type = string
description = "Rancher server version (format: v0.0.0)"
default = "2.7.9"
default = "2.9.2"
}

variable "rancher_helm_repository" {
Expand All @@ -86,7 +86,6 @@ variable "rancher_server_admin_password" {
description = "Admin password to use for Rancher server bootstrap, min. 12 characters"
}

# Required
variable "add_windows_node" {
type = bool
description = "Add a windows node to the workload cluster"
Expand Down