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

Fix/merge conflict staging resolution #4917

Merged
merged 7 commits into from
Sep 19, 2023
Merged

Fix/merge conflict staging resolution #4917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
590ab03
fix: maticjs version
rhlsthrm Sep 19, 2023
f727e58
fix: migrate state to new backend (#4901)
carlomazzaferro Sep 19, 2023
40053ad
fix: prod state migrations (#4903)
carlomazzaferro Sep 19, 2023
764c717
Fix/migrate state prod core (#4904)
carlomazzaferro Sep 19, 2023
29ad402
Fix/ci fix - remove flow control (#4910)
carlomazzaferro Sep 19, 2023
98eb2e7
Fix/tf version bump (#4914)
carlomazzaferro Sep 19, 2023
b9d1575
Merge branch 'main' of https://github.com/connext/nxtp into staging
carlomazzaferro Sep 19, 2023
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
20 changes: 7 additions & 13 deletions .github/workflows/build-test-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v1
with:
terraform_version: 1.1.7
terraform_version: 1.5.7

- name: Checkout repository
uses: actions/checkout@v3
Expand Down Expand Up @@ -991,7 +991,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v1
with:
terraform_version: 1.1.7
terraform_version: 1.5.7

- name: Setup Sops
uses: mdgreenwald/mozilla-sops-action@v1.2.0
Expand Down Expand Up @@ -1023,7 +1023,6 @@ jobs:
working-directory: ./ops/testnet/staging/backend
run: |
terraform plan -var-file=tfvars.json
continue-on-error: true

- name: Terraform Docker Image onto AWS
if: github.ref == 'refs/heads/staging'
Expand Down Expand Up @@ -1056,7 +1055,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v1
with:
terraform_version: 1.1.7
terraform_version: 1.5.7

- name: Setup Sops
uses: mdgreenwald/mozilla-sops-action@v1.2.0
Expand Down Expand Up @@ -1088,7 +1087,6 @@ jobs:
working-directory: ./ops/testnet/staging/core
run: |
terraform plan -var-file=tfvars.json
continue-on-error: true

- name: Terraform Docker Image onto AWS
if: github.ref == 'refs/heads/staging'
Expand Down Expand Up @@ -1131,7 +1129,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v1
with:
terraform_version: 1.1.7
terraform_version: 1.5.7

- name: Setup Sops
uses: mdgreenwald/mozilla-sops-action@v1.2.0
Expand Down Expand Up @@ -1163,7 +1161,6 @@ jobs:
working-directory: ./ops/testnet/prod/core
run: |
terraform plan -var-file=tfvars.json
continue-on-error: true

- name: Terraform Docker Image onto AWS
id: apply
Expand Down Expand Up @@ -1200,7 +1197,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v1
with:
terraform_version: 1.1.7
terraform_version: 1.5.7

- name: Setup Sops
uses: mdgreenwald/mozilla-sops-action@v1.2.0
Expand Down Expand Up @@ -1232,7 +1229,6 @@ jobs:
working-directory: ./ops/testnet/prod/backend
run: |
terraform plan -var-file=tfvars.json
continue-on-error: true

- name: Terraform Docker Image onto AWS
id: apply
Expand Down Expand Up @@ -1269,7 +1265,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v1
with:
terraform_version: 1.1.7
terraform_version: 1.5.7

- name: Setup Sops
uses: mdgreenwald/mozilla-sops-action@v1.2.0
Expand Down Expand Up @@ -1301,7 +1297,6 @@ jobs:
working-directory: ./ops/mainnet/prod/backend
run: |
terraform plan -var-file=tfvars.json
continue-on-error: true

- name: Terraform Docker Image onto AWS
id: apply
Expand Down Expand Up @@ -1333,7 +1328,7 @@ jobs:
- name: Setup Terraform
uses: hashicorp/setup-terraform@v1
with:
terraform_version: 1.1.7
terraform_version: 1.5.7

- name: Setup Sops
uses: mdgreenwald/mozilla-sops-action@v1.2.0
Expand Down Expand Up @@ -1365,7 +1360,6 @@ jobs:
working-directory: ./ops/mainnet/prod/core
run: |
terraform plan -var-file=tfvars.json
continue-on-error: true

- name: Terraform Docker Image onto AWS
id: apply
Expand Down
2 changes: 1 addition & 1 deletion ops/infra/.terraform-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.7
1.5.7
1 change: 1 addition & 0 deletions ops/mainnet/prod/backend/.terraform-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.5.7
2 changes: 1 addition & 1 deletion ops/mainnet/prod/backend/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
backend "s3" {
bucket = "nxtp-terraform-mainnet-prod-backend"
key = "state/"
key = "state"
region = "us-east-1"
}
}
Expand Down
1 change: 1 addition & 0 deletions ops/mainnet/prod/core/.terraform-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.5.7
2 changes: 1 addition & 1 deletion ops/mainnet/prod/core/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
backend "s3" {
bucket = "nxtp-terraform-mainnet-prod-core"
key = "state/"
key = "state"
region = "us-east-1"
}
}
Expand Down
4 changes: 2 additions & 2 deletions ops/modules/networking/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
data "aws_availability_zones" "available" {}

resource "aws_vpc" "main" {
cidr_block = var.cidr_block
cidr_block = var.cidr_block
enable_dns_hostnames = true
tags = {
Environment = var.environment
Expand Down Expand Up @@ -47,7 +47,7 @@ resource "aws_route" "internet_access" {
#Create a NAT gateway with an EIP for each private subnet to get internet connectivity
resource "aws_eip" "gw" {
count = var.az_count
vpc = true
domain = "vpc"
depends_on = [aws_internet_gateway.main]
}

Expand Down
1 change: 1 addition & 0 deletions ops/testnet/prod/backend/.terraform-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.5.7
2 changes: 1 addition & 1 deletion ops/testnet/prod/backend/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
backend "s3" {
bucket = "nxtp-terraform-testnet-prod-backend"
key = "state/"
key = "state"
region = "us-east-1"
}
}
Expand Down
1 change: 1 addition & 0 deletions ops/testnet/prod/core/.terraform-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.5.7
2 changes: 1 addition & 1 deletion ops/testnet/prod/core/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
backend "s3" {
bucket = "nxtp-terraform-testnet-prod-core"
key = "state/"
key = "state"
region = "us-east-1"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ops/testnet/staging/backend/.terraform-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.7
1.5.7
2 changes: 1 addition & 1 deletion ops/testnet/staging/core/.terraform-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.7
1.5.7
6 changes: 6 additions & 0 deletions ops/testnet/staging/core/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ variable "full_image_name_sequencer_subscriber" {
default = "ghcr.io/connext/sequencer-subscriber:sha-b5bb49a"
}

variable "full_image_name_router_executor" {
type = string
description = "executor image name"
default = "ghcr.io/connext/router-executor:sha-7855c40"
}

variable "full_image_name_relayer" {
type = string
description = "relayer image name"
Expand Down