README.md

@@ -21,7 +21,6 @@ Runway command line tool.
     CI_PROJECT_ID=<id of the runway deployment repository>
     GITLAB_USER_LOGIN=<gitlab username>
     TF_PASSWORD=<gitlab token>
-    TF_VAR_gitlab_service_project_id=<service repository ID>
     TF_VAR_runway_service_id=<name of the runway deployment repository>
     TF_VAR_canary_percent=100
     TF_VAR_image=registry.gitlab.com/<path to your image>

ci-tasks/deployment-project/runway.yml

@@ -25,7 +25,6 @@ default:
 variables:
   CLOUDSDK_RUN_REGION: us-east1
   TF_VAR_runway_service_id: $RUNWAY_SERVICE_ID
-  TF_VAR_gitlab_service_project_id: $SOURCE_PROJECT_ID
   TF_VAR_image: $IMAGE
   DOCKER_TLS_CERTDIR: "/certs"
   DOCKER_HOST: "tcp://docker:2376"

reconciler/main.tf

@@ -281,10 +281,3 @@ resource "google_cloud_run_service_iam_policy" "noauth" {
 
   policy_data = data.google_iam_policy.noauth.policy_data
 }
-
-resource "gitlab_project_environment" "service_project_environment" {
-  project             = var.gitlab_service_project_id
-  name                = var.environment
-  external_url        = "https://${replace(local.service_dns_name, "/\\.$/", "")}"
-  stop_before_destroy = true
-}

reconciler/moved.tf

-# Resources moved (these can be removed once applied but harmless to keep around)
+#
+# Moved resources
+#
+# Resources that have been moved. These can be removed once applied but are
+# harmless to keep around.
 
 moved {
   from = module.lb_http
@@ -9,3 +13,19 @@ moved {
   from = google_dns_record_set.runway
   to   = module.external_lb[0].google_dns_record_set.runway
 }
+
+#
+# Removed resources
+#
+# Resources that are no longer managed by Terraform, but that Terraform also
+# shoudn't delete.
+
+# Project environment management has been delegated to service projects.
+# https://gitlab.com/gitlab-com/gl-infra/platform/runway/team/-/issues/36
+# https://gitlab.com/gitlab-com/gl-infra/platform/runway/runwayctl/-/merge_requests/237
+removed {
+  from = gitlab_project_environment.service_project_environment
+  lifecycle {
+    destroy = false
+  }
+}

reconciler/variables.tf

@@ -59,11 +59,6 @@ variable "environment" {
   }
 }
 
-variable "gitlab_service_project_id" {
-  type        = number
-  description = "The id of the GitLab service project"
-}
-
 variable "thanos_endpoint" {
   type = string
 }

reconciler/versions.tf

 terraform {
-  required_version = ">= 1.4"
+  required_version = ">= 1.7"
 
   required_providers {
     cloudflare = {