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!: Update bastion image family to debian-11 #102

Merged
merged 2 commits into from
Mar 14, 2022
Merged

feat!: Update bastion image family to debian-11 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26c7523
Update centos image family name to be centos-stream-9
catherinetcai Mar 9, 2022
8ceb685
Update image project and family to point to Debian
catherinetcai Mar 11, 2022
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ If the user does not share the same domain as the org the bastion is in, you wil
| fw\_name\_allow\_ssh\_from\_iap | Firewall rule name for allowing SSH from IAP | `string` | `"allow-ssh-from-iap-to-tunnel"` | no |
| host\_project | The network host project ID | `string` | `""` | no |
| image | Source image for the Bastion. If image is not specified, image\_family will be used (which is the default). | `string` | `""` | no |
| image\_family | Source image family for the Bastion. | `string` | `"centos-8"` | no |
| image\_project | Project where the source image for the Bastion comes from | `string` | `"centos-cloud"` | no |
| image\_family | Source image family for the Bastion. | `string` | `"debian-11"` | no |
| image\_project | Project where the source image for the Bastion comes from | `string` | `"debian-cloud"` | no |
| labels | Key-value map of labels to assign to the bastion host | `map(any)` | `{}` | no |
| machine\_type | Instance type for the Bastion host | `string` | `"n1-standard-1"` | no |
| members | List of IAM resources to allow access to the bastion host | `list(string)` | `[]` | no |
Expand Down
4 changes: 2 additions & 2 deletions modules/bastion-group/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ provision a project with the necessary APIs enabled.
| fw\_name\_allow\_ssh\_from\_iap | Firewall rule name for allowing SSH from IAP | `string` | `"allow-ssh-from-iap-to-bastion-group"` | no |
| health\_check | Health check config for the mig. | <pre>object({<br> type = string<br> initial_delay_sec = number<br> check_interval_sec = number<br> healthy_threshold = number<br> timeout_sec = number<br> unhealthy_threshold = number<br> response = string<br> proxy_header = string<br> port = number<br> request = string<br><br> # Unused fields.<br> request_path = string<br> host = string<br> })</pre> | <pre>{<br> "check_interval_sec": 30,<br> "healthy_threshold": 1,<br> "host": "",<br> "initial_delay_sec": 30,<br> "port": 22,<br> "proxy_header": "NONE",<br> "request": "",<br> "request_path": "",<br> "response": "",<br> "timeout_sec": 10,<br> "type": "tcp",<br> "unhealthy_threshold": 5<br>}</pre> | no |
| host\_project | The network host project ID | `string` | `""` | no |
| image\_family | Source image family for the Bastion. | `string` | `"centos-7"` | no |
| image\_project | Project where the source image for the Bastion comes from | `string` | `"gce-uefi-images"` | no |
| image\_family | Source image family for the Bastion. | `string` | `"debian-11"` | no |
| image\_project | Project where the source image for the Bastion comes from | `string` | `"debian-cloud"` | no |
| labels | Key-value map of labels to assign to the bastion host | `map(any)` | `{}` | no |
| machine\_type | Instance type for the Bastion host | `string` | `"n1-standard-1"` | no |
| members | List of IAM resources to allow access to the bastion host | `list(string)` | `[]` | no |
Expand Down
4 changes: 2 additions & 2 deletions modules/bastion-group/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ variable "target_size" {

variable "image_family" {
description = "Source image family for the Bastion."
default = "centos-7"
default = "debian-11"
}

variable "image_project" {
description = "Project where the source image for the Bastion comes from"
default = "gce-uefi-images"
default = "debian-cloud"
}

variable "tags" {
Expand Down
4 changes: 2 additions & 2 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ variable "image_family" {
type = string

description = "Source image family for the Bastion."
default = "centos-8"
default = "debian-11"
}

variable "image_project" {
type = string

description = "Project where the source image for the Bastion comes from"
default = "centos-cloud"
default = "debian-cloud"
}

variable "create_instance_from_template" {
Expand Down