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.

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

[release/v1.8] Fix default rockylinux EC2 image filter query in AWS terraform #3262

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/terraform/aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ No modules.
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_ami"></a> [ami](#input\_ami) | AMI ID, use it to fixate control-plane AMI in order to avoid force-recreation it at later times | `string` | `""` | no |
| <a name="input_ami_filters"></a> [ami\_filters](#input\_ami\_filters) | map with AMI filters | <pre>map(object({<br> owners = list(string)<br> image_name = list(string)<br> ssh_username = string<br> worker_os = string<br> }))</pre> | <pre>{<br> "amzn": {<br> "image_name": [<br> "amzn2-ami-hvm-2.0.*-x86_64-gp2"<br> ],<br> "owners": [<br> "137112412989"<br> ],<br> "ssh_username": "ec2-user",<br> "worker_os": "amzn2"<br> },<br> "centos": {<br> "image_name": [<br> "CentOS Linux 7 x86_64*"<br> ],<br> "owners": [<br> "125523088429"<br> ],<br> "ssh_username": "centos",<br> "worker_os": "centos"<br> },<br> "flatcar": {<br> "image_name": [<br> "Flatcar-stable-*-hvm"<br> ],<br> "owners": [<br> "075585003325"<br> ],<br> "ssh_username": "core",<br> "worker_os": "flatcar"<br> },<br> "rhel": {<br> "image_name": [<br> "RHEL-8*_HVM-*-x86_64-*"<br> ],<br> "owners": [<br> "309956199498"<br> ],<br> "ssh_username": "ec2-user",<br> "worker_os": "rhel"<br> },<br> "rockylinux": {<br> "image_name": [<br> "Rocky-8-ec2-*.x86_64"<br> ],<br> "owners": [<br> "792107900819"<br> ],<br> "ssh_username": "rocky",<br> "worker_os": "rockylinux"<br> },<br> "ubuntu": {<br> "image_name": [<br> "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*"<br> ],<br> "owners": [<br> "099720109477"<br> ],<br> "ssh_username": "ubuntu",<br> "worker_os": "ubuntu"<br> }<br>}</pre> | no |
| <a name="input_ami_filters"></a> [ami\_filters](#input\_ami\_filters) | map with AMI filters | <pre>map(object({<br> owners = list(string)<br> image_name = list(string)<br> ssh_username = string<br> worker_os = string<br> }))</pre> | <pre>{<br> "amzn": {<br> "image_name": [<br> "amzn2-ami-hvm-2.0.*-x86_64-gp2"<br> ],<br> "owners": [<br> "137112412989"<br> ],<br> "ssh_username": "ec2-user",<br> "worker_os": "amzn2"<br> },<br> "centos": {<br> "image_name": [<br> "CentOS Linux 7 x86_64*"<br> ],<br> "owners": [<br> "125523088429"<br> ],<br> "ssh_username": "centos",<br> "worker_os": "centos"<br> },<br> "flatcar": {<br> "image_name": [<br> "Flatcar-stable-*-hvm"<br> ],<br> "owners": [<br> "075585003325"<br> ],<br> "ssh_username": "core",<br> "worker_os": "flatcar"<br> },<br> "rhel": {<br> "image_name": [<br> "RHEL-8*_HVM-*-x86_64-*"<br> ],<br> "owners": [<br> "309956199498"<br> ],<br> "ssh_username": "ec2-user",<br> "worker_os": "rhel"<br> },<br> "rockylinux": {<br> "image_name": [<br> "Rocky-8-EC2-*.x86_64"<br> ],<br> "owners": [<br> "792107900819"<br> ],<br> "ssh_username": "rocky",<br> "worker_os": "rockylinux"<br> },<br> "ubuntu": {<br> "image_name": [<br> "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*"<br> ],<br> "owners": [<br> "099720109477"<br> ],<br> "ssh_username": "ubuntu",<br> "worker_os": "ubuntu"<br> }<br>}</pre> | no |
| <a name="input_apiserver_alternative_names"></a> [apiserver\_alternative\_names](#input\_apiserver\_alternative\_names) | subject alternative names for the API Server signing cert. | `list(string)` | `[]` | no |
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS region to speak to | `string` | `"eu-west-3"` | no |
| <a name="input_bastion_host_key"></a> [bastion\_host\_key](#input\_bastion\_host\_key) | Bastion SSH host public key | `string` | `null` | no |
Expand Down
2 changes: 1 addition & 1 deletion examples/terraform/aws/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ variable "ami_filters" {

rockylinux = {
owners = ["792107900819"] # RockyLinux
image_name = ["Rocky-8-ec2-*.x86_64"]
image_name = ["Rocky-8-EC2-*.x86_64"]
ssh_username = "rocky"
worker_os = "rockylinux"
}
Expand Down