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

Fix pinning of machine_type #149

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
04372a2
add machine_type example
dimisjim Apr 18, 2024
ea2a22a
fix null case for machine_image
dimisjim Apr 21, 2024
08a51cd
Merge branch 'main' into patch-1
bschaatsbergen Apr 25, 2024
5d4c409
Merge branch 'main' into patch-1
d-costa Apr 25, 2024
8174e4b
Merge branch 'main' into patch-1
d-costa May 7, 2024
2660466
Merge branch 'main' into patch-1
bschaatsbergen May 14, 2024
0d5ca34
Merge branch 'main' into patch-1
d-costa Aug 6, 2024
74bee1b
chore(deps): update terraform-docs/gh-actions action to v1.2.2
renovate[bot] Sep 9, 2024
c03fb2c
chore(deps): update planetscale/ghcommit-action action to v0.1.45
renovate[bot] Sep 14, 2024
8f5c684
Add license scan report and status
fossabot Sep 16, 2024
5e2c069
chore(deps): update planetscale/ghcommit-action action to v0.1.47
renovate[bot] Oct 7, 2024
2f2525b
chore(deps): update planetscale/ghcommit-action action to v0.2.0
renovate[bot] Oct 9, 2024
bbf41a9
chore(deps): update terraform-docs/gh-actions action to v1.3.0
renovate[bot] Oct 11, 2024
d29525a
terraform-docs: automated action
github-actions[bot] Oct 11, 2024
b8b0852
Loosen module version requirements for container-vm
cblkwell Nov 1, 2024
4bd6019
Fixing README
cblkwell Nov 4, 2024
fcbf843
Adding enabled = true for iap backend
cblkwell Nov 4, 2024
877024b
Bumping version requirement due to iap enabled setting
cblkwell Nov 4, 2024
8eeb2eb
Fixing README
cblkwell Nov 4, 2024
0272b7f
Fixing README
cblkwell Nov 7, 2024
2a869cf
chore: fix terraform docs behavior
d-costa Nov 11, 2024
bc3f02c
Merge branch 'main' into patch-1
dimisjim Nov 13, 2024
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ You can check the status of the certificate in the Google Cloud Console.
| <a name="input_iap_backend_security_policy"></a> [iap\_backend\_security\_policy](#input\_iap\_backend\_security\_policy) | Name of the security policy to apply to the IAP backend service | `string` | `null` | no |
| <a name="input_image"></a> [image](#input\_image) | Docker image. This is most often a reference to a container located in a container registry | `string` | `"ghcr.io/runatlantis/atlantis:latest"` | no |
| <a name="input_labels"></a> [labels](#input\_labels) | Key-value pairs representing labels attaching to instance & instance template | `map(any)` | `{}` | no |
| <a name="input_machine_image"></a> [machine\_image](#input\_machine\_image) | The machine image to create VMs with, if not specified, latest cos\_cloud/cos\_stable is used | `string` | `null` | no |
| <a name="input_machine_image"></a> [machine\_image](#input\_machine\_image) | The machine image to create VMs with, if not specified, latest cos\_cloud/cos\_stable is used. To pin to one, use the following format: projects/cos-cloud/global/images/cos-stable-109-17800-147-54 | `string` | `null` | no |
| <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | The machine type to run Atlantis on | `string` | `"n2-standard-2"` | no |
| <a name="input_name"></a> [name](#input\_name) | Custom name that's used during resource creation | `string` | n/a | yes |
| <a name="input_network"></a> [network](#input\_network) | Name of the network | `string` | n/a | yes |
Expand Down
2 changes: 2 additions & 0 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ module "container" {
source = "terraform-google-modules/container-vm/google"
version = "3.1.1"

cos_image_name = element(split("/", var.machine_image), length(split("/", var.machine_image)) - 1)

container = {
image = var.image
securityContext = {
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ variable "zone" {

variable "machine_image" {
type = string
description = "The machine image to create VMs with, if not specified, latest cos_cloud/cos_stable is used"
description = "The machine image to create VMs with, if not specified, latest cos_cloud/cos_stable is used. To pin to one, use the following format: projects/cos-cloud/global/images/cos-stable-109-17800-147-54"
default = null
}

Expand Down