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

Jump to bottom

chore: upgrade to Aspect Workflows 5.8.0-rc9 #78

Merged
merged 1 commit into from
Sep 27, 2023
Merged

chore: upgrade to Aspect Workflows 5.8.0-rc9 #78

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
4 changes: 3 additions & 1 deletion .aspect/workflows/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ terraform {
}
}

provider "google" {
locals {
# Project & region of the Workflows deployment. Alternately, you may configure a global `provider
# "google"` with the desired project & region and the Workflows module will default to that.
project = "aw-deployment-rules-jasmine"
region = "us-west2"
}
8 changes: 8 additions & 0 deletions .aspect/workflows/terraform/vpc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
resource "google_compute_network" "workflows_network" {
name = "workflows-network"
project = local.project
auto_create_subnetworks = false
routing_mode = "REGIONAL"
}

resource "google_compute_subnetwork" "workflows_subnet" {
name = "workflows-subnet"
project = local.project
region = local.region
ip_cidr_range = "10.2.0.0/16"
network = google_compute_network.workflows_network.id
}

resource "google_compute_firewall" "ssh" {
name = "allow-ssh"
project = local.project
description = "Enable SSHing into VM instances"
allow {
ports = ["22"]
Expand All @@ -25,6 +29,8 @@ resource "google_compute_firewall" "ssh" {

resource "google_compute_router" "router" {
name = "router"
project = local.project
region = local.region
network = google_compute_network.workflows_network.id

bgp {
Expand All @@ -34,6 +40,8 @@ resource "google_compute_router" "router" {

resource "google_compute_router_nat" "nat" {
name = "router-nat"
project = local.project
region = local.region
router = google_compute_router.router.name
nat_ip_allocate_option = "AUTO_ONLY"
source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_IP_RANGES"
Expand Down
13 changes: 10 additions & 3 deletions .aspect/workflows/terraform/workflows.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,24 @@ data "google_compute_image" "runner_image" {
}

module "aspect_workflows" {
# Project & region configuration. This is optional. Alternately, you may configure a global
# provider project & region and the Workflows module will default to that.
project = local.project
region = local.region

# Aspect Workflows terraform module
source = "https://s3.us-east-2.amazonaws.com/static.aspect.build/aspect/5.8.0-rc8/workflows-gcp/terraform-gcp-aspect-workflows.zip"
source = "https://s3.us-east-2.amazonaws.com/static.aspect.build/aspect/5.8.0-rc9/workflows-gcp/terraform-gcp-aspect-workflows.zip"

# Network properties
network = google_compute_network.workflows_network.id
subnetwork = google_compute_subnetwork.workflows_subnet.id

# Number of nodes & machine type in the kubernetes cluster where the remote cache & observability
# services run.
cluster_standard_node_count = 3
cluster_standard_node_machine_type = "e2-standard-2"
k8s_cluster = {
node_count = 3
machine_type = "e2-standard-2"
}

# Remote cache configuration
remote = {
Expand Down