Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

msp/rollouts: use new in-terraform custom target provisioning#62644

Merged
bobheadxi merged 3 commits intomainfrom
msp-clouddeploy-terraform
May 15, 2024
Merged

msp/rollouts: use new in-terraform custom target provisioning#62644
bobheadxi merged 3 commits intomainfrom
msp-clouddeploy-terraform

Conversation

@bobheadxi
Copy link
Member

@bobheadxi bobheadxi commented May 13, 2024

Closes CORE-23 - this change removes the manual gcloud deploy apply step previously required to enable MSP rollouts, thanks to a recent release of the Google Terraform provider.

Test plan

https://github.com/sourcegraph/managed-services/pull/1403

@cla-bot cla-bot bot added the cla-signed label May 13, 2024
@bobheadxi bobheadxi changed the title msp/clouddeploy: use new in-terraform custom target provisioning msp/rollouts: use new in-terraform custom target provisioning May 13, 2024
@bobheadxi bobheadxi force-pushed the msp-clouddeploy-terraform branch from b5e435f to af75f83 Compare May 13, 2024 23:45
bobheadxi referenced this pull request in sourcegraph/managed-services-platform-cdktf May 14, 2024
See https://github.com/sourcegraph/sourcegraph/pull/62650 for context:

> We need to upgrade to use `import` blocks (TF 1.5), which will make
https://github.com/sourcegraph/sourcegraph/pull/62644 and CORE-23
capable of a smooth rollout (otherwise we encounter conflict with the
previously hand-deployed resources).

This change upgrades the version of Terraform and CDKTF to use when
generating these packages.
bobheadxi referenced this pull request May 14, 2024
According to https://developer.hashicorp.com/terraform/language/v1.7.x/upgrade-guides this should be compatible with our current version, 1.3.10

We need to upgrade to use `import` blocks (TF 1.5), which will make https://github.com/sourcegraph/sourcegraph/pull/62644 and CORE-23 capable of a smooth rollout (otherwise we encounter conflict with the previously hand-deployed resources).

This also requires our CDKTF modules to be regenerated with the new Terraform version: sourcegraph/managed-services-platform-cdktf#10

## Test plan

n/a - will do a staged rollout per https://www.notion.so/sourcegraph/MSP-infrastructure-upgrades-1808e7e45bd54f419dd93af542d99238?pvs=4
@bobheadxi bobheadxi marked this pull request as ready for review May 14, 2024 21:01
@bobheadxi bobheadxi requested a review from jac May 14, 2024 21:01
@bobheadxi bobheadxi merged commit 456315b into main May 15, 2024
@bobheadxi bobheadxi deleted the msp-clouddeploy-terraform branch May 15, 2024 01:51
bobheadxi added a commit that referenced this pull request May 15, 2024
Now that #62644 (CORE-23) is rolled out, this import block is no longer needed (and may even be disruptive when provisioning new rollout pipelines). The change was rolled out in:

- sourcegraph/managed-services#1416
- sourcegraph/managed-services#1417
- sourcegraph/managed-services#1403

## Test plan

n/a
Strum355 pushed a commit that referenced this pull request May 15, 2024
Now that #62644 (CORE-23) is rolled out, this import block is no longer needed (and may even be disruptive when provisioning new rollout pipelines). The change was rolled out in:

- https://github.com/sourcegraph/managed-services/pull/1416
- https://github.com/sourcegraph/managed-services/pull/1417
- https://github.com/sourcegraph/managed-services/pull/1403

## Test plan

n/a
akalia25 added a commit that referenced this pull request May 22, 2024
* Fix bedrock URL encoding to mimic AWS CLI (#62695)

* Fix bedrock URL encoding to mimic AWS CLI

* Update changelog

* appliance: namespace scoping (#62663)

Allow a namespace to be configured, defaulting to all namespaces.
Without this setting, if an admin deploys the appliance with
namespace-scoped RBAC, it would throw errors due to not being able to
watch ConfigMaps in all namespaces.

* bazel: migrate legacy postgres-12 dockerfile to rules_oci (#61963)

* build-tracker: include error if failing to write to bigquery (#62699)

Without this, this error won't be logged to Sentry, resulting in us missing it unless we check GCP

## Test plan

Discussed with @jac

* Svelte: Fix global header navigation layers (#62697)

Fix global header navigation layers

* msp/rollouts: remove Cloud Deploy target import (#62687)

Now that #62644 (CORE-23) is rolled out, this import block is no longer needed (and may even be disruptive when provisioning new rollout pipelines). The change was rolled out in:

- sourcegraph/managed-services#1416
- sourcegraph/managed-services#1417
- sourcegraph/managed-services#1403

## Test plan

n/a

* msp/cloudrun: use GA launch stage (#62685)

VPC direct egress is now GA: see example in https://registry.terraform.io/providers/hashicorp/google/5.29.0/docs/resources/cloud_run_v2_service#example-usage---cloudrunv2-service-directvpc and https://cloud.google.com/run/docs/configuring/vpc-direct-vpc

This also fixes the infinite `GA` -> `BETA` drift we have in TFC

* Symbols: new backend integration test (#62686)

This PR creates a new GraphQL integration test file focused on symbol search.
It exercises the same searches the web client uses for code navigation.

In a follow-up, we will add cases for older commits and enable Rockskip.

* fix: update search timeout docs (#62692)

* update telemetry sensitivemetadataallowlist to filter based on keys

* fix main merge

* Update BUILD.bazel

* Update teestore_test.go

* add better code-comments and error messaging

* add test coverage on non-string types getting redacted with proper error value return

* fix spacing!

---------

Co-authored-by: Rik <rik.nauta@sourcegraph.com>
Co-authored-by: Craig Furman <craig.furman@sourcegraph.com>
Co-authored-by: Noah S-C <noah@sourcegraph.com>
Co-authored-by: Vova Kulikov <vovakulikov@icloud.com>
Co-authored-by: Robert Lin <robert@bobheadxi.dev>
Co-authored-by: Julie Tibshirani <julietibs@apache.org>
Co-authored-by: Michael Bahr <1830132+bahrmichael@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants