From c506a09f564a58f945e2d58c7a88b30d22435025 Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@gmail.com>
Date: Thu, 15 Jul 2021 16:03:29 -0700
Subject: [PATCH] infra/gcp: mv k8s-releng-prod to its own folder

---
 infra/gcp/ensure-releng.sh | 12 ++++++++----
 infra/gcp/infra.yaml       |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/infra/gcp/ensure-releng.sh b/infra/gcp/ensure-releng.sh
index 35dab9bf6e9..f48ec19f4d0 100755
--- a/infra/gcp/ensure-releng.sh
+++ b/infra/gcp/ensure-releng.sh
@@ -36,10 +36,8 @@ function usage() {
     echo > /dev/stderr
 }
 
-# NB: Please keep this sorted.
-PROJECTS=(
-    k8s-releng-prod
-)
+mapfile -t PROJECTS < <(k8s_infra_projects "releng")
+readonly PROJECTS
 
 if [ $# = 0 ]; then
     # default to all release projects
@@ -47,6 +45,12 @@ if [ $# = 0 ]; then
 fi
 
 for PROJECT; do
+
+    if ! k8s_infra_project "releng" "${PROJECT}" >/dev/null; then
+        color 1 "Skipping unrecognized release project name: ${PROJECT}"
+        continue
+    fi
+
     color 3 "Configuring: ${PROJECT}"
 
     # Make the project, if needed
diff --git a/infra/gcp/infra.yaml b/infra/gcp/infra.yaml
index 4fe2026bfa9..79c2656ce48 100644
--- a/infra/gcp/infra.yaml
+++ b/infra/gcp/infra.yaml
@@ -241,6 +241,9 @@ infra:
     projects:
       k8s-release:
       k8s-release-test-prod: # TODO: should this be prod or release?:
+
+  releng:
+    projects:
       k8s-releng-prod:
         managed_by: infra/gcp/ensure-releng-project.sh