From 66e1d0dad5b46e894715cfa35569566c431654c9 Mon Sep 17 00:00:00 2001
From: Arnaud Meukam <ameukam@gmail.com>
Date: Mon, 30 Aug 2021 17:25:33 +0200
Subject: [PATCH] infra/gcp: mv bash scripts to a dedicated folder

Ref: https://github.com/kubernetes/k8s.io/issues/516

Move every bash script used for GCP operations to a separated folder.

Signed-off-by: Arnaud Meukam <ameukam@gmail.com>
---
 audit/audit-gcp.sh                                              | 2 +-
 infra/gcp/{ => bash}/backup_tools/OWNERS                        | 0
 infra/gcp/{ => bash}/backup_tools/README.md                     | 0
 infra/gcp/{ => bash}/backup_tools/backup.sh                     | 0
 infra/gcp/{ => bash}/backup_tools/backup_images_expected.yaml   | 0
 infra/gcp/{ => bash}/backup_tools/backup_lib.sh                 | 0
 infra/gcp/{ => bash}/backup_tools/backup_prod.sh                | 0
 infra/gcp/{ => bash}/backup_tools/backup_test.sh                | 0
 infra/gcp/{ => bash}/cip-auditor/OWNERS                         | 0
 infra/gcp/{ => bash}/cip-auditor/deploy.sh                      | 0
 infra/gcp/{ => bash}/ensure-conformance-storage.sh              | 0
 infra/gcp/{ => bash}/ensure-env-cip-auditor.sh                  | 0
 infra/gcp/{ => bash}/ensure-gsuite.sh                           | 0
 infra/gcp/{ => bash}/ensure-main-project.sh                     | 0
 infra/gcp/{ => bash}/ensure-organization.sh                     | 0
 infra/gcp/{ => bash}/ensure-prod-storage-gclb.sh                | 0
 infra/gcp/{ => bash}/ensure-prod-storage.sh                     | 0
 infra/gcp/{ => bash}/ensure-release-projects.sh                 | 0
 infra/gcp/{ => bash}/ensure-releng.sh                           | 0
 infra/gcp/{ => bash}/ensure-staging-storage.sh                  | 0
 infra/gcp/{ => bash}/infra.yaml                                 | 0
 infra/gcp/{ => bash}/lib.sh                                     | 0
 infra/gcp/{ => bash}/lib_gcr.sh                                 | 0
 infra/gcp/{ => bash}/lib_gcs.sh                                 | 0
 infra/gcp/{ => bash}/lib_gsm.sh                                 | 0
 infra/gcp/{ => bash}/lib_iam.sh                                 | 0
 infra/gcp/{ => bash}/lib_infra.sh                               | 0
 infra/gcp/{ => bash}/lib_services.sh                            | 0
 infra/gcp/{ => bash}/lib_util.sh                                | 0
 infra/gcp/{ => bash}/namespaces/OWNERS                          | 0
 infra/gcp/{ => bash}/namespaces/ensure-namespaces.sh            | 0
 infra/gcp/{ => bash}/namespaces/namespace-user-role-binding.yml | 0
 infra/gcp/{ => bash}/namespaces/namespace-user-role.yml         | 0
 infra/gcp/{ => bash}/namespaces/namespace.yml                   | 0
 infra/gcp/{ => bash}/prow/OWNERS                                | 0
 infra/gcp/{ => bash}/prow/ensure-e2e-projects.sh                | 0
 infra/gcp/{ => bash}/roles/CustomRole.yaml                      | 0
 infra/gcp/{ => bash}/roles/OWNERS                               | 0
 infra/gcp/{ => bash}/roles/audit.viewer.yaml                    | 0
 infra/gcp/{ => bash}/roles/container.deployer.yaml              | 0
 infra/gcp/{ => bash}/roles/generate-role-yaml.sh                | 0
 infra/gcp/{ => bash}/roles/iam.serviceAccountLister.yaml        | 0
 infra/gcp/{ => bash}/roles/organization.admin.yaml              | 0
 infra/gcp/{ => bash}/roles/prow.viewer.yaml                     | 0
 infra/gcp/{ => bash}/roles/secretmanager.secretLister.yaml      | 0
 infra/gcp/{ => bash}/roles/specs/CustomRole.yaml                | 0
 infra/gcp/{ => bash}/roles/specs/audit.viewer.yaml              | 0
 infra/gcp/{ => bash}/roles/specs/container.deployer.yaml        | 0
 infra/gcp/{ => bash}/roles/specs/iam.serviceAccountLister.yaml  | 0
 infra/gcp/{ => bash}/roles/specs/organization.admin.yaml        | 0
 infra/gcp/{ => bash}/roles/specs/prow.viewer.yaml               | 0
 .../gcp/{ => bash}/roles/specs/secretmanager.secretLister.yaml  | 0
 52 files changed, 1 insertion(+), 1 deletion(-)
 rename infra/gcp/{ => bash}/backup_tools/OWNERS (100%)
 rename infra/gcp/{ => bash}/backup_tools/README.md (100%)
 rename infra/gcp/{ => bash}/backup_tools/backup.sh (100%)
 rename infra/gcp/{ => bash}/backup_tools/backup_images_expected.yaml (100%)
 rename infra/gcp/{ => bash}/backup_tools/backup_lib.sh (100%)
 rename infra/gcp/{ => bash}/backup_tools/backup_prod.sh (100%)
 rename infra/gcp/{ => bash}/backup_tools/backup_test.sh (100%)
 rename infra/gcp/{ => bash}/cip-auditor/OWNERS (100%)
 rename infra/gcp/{ => bash}/cip-auditor/deploy.sh (100%)
 rename infra/gcp/{ => bash}/ensure-conformance-storage.sh (100%)
 rename infra/gcp/{ => bash}/ensure-env-cip-auditor.sh (100%)
 rename infra/gcp/{ => bash}/ensure-gsuite.sh (100%)
 rename infra/gcp/{ => bash}/ensure-main-project.sh (100%)
 rename infra/gcp/{ => bash}/ensure-organization.sh (100%)
 rename infra/gcp/{ => bash}/ensure-prod-storage-gclb.sh (100%)
 rename infra/gcp/{ => bash}/ensure-prod-storage.sh (100%)
 rename infra/gcp/{ => bash}/ensure-release-projects.sh (100%)
 rename infra/gcp/{ => bash}/ensure-releng.sh (100%)
 rename infra/gcp/{ => bash}/ensure-staging-storage.sh (100%)
 rename infra/gcp/{ => bash}/infra.yaml (100%)
 rename infra/gcp/{ => bash}/lib.sh (100%)
 rename infra/gcp/{ => bash}/lib_gcr.sh (100%)
 rename infra/gcp/{ => bash}/lib_gcs.sh (100%)
 rename infra/gcp/{ => bash}/lib_gsm.sh (100%)
 rename infra/gcp/{ => bash}/lib_iam.sh (100%)
 rename infra/gcp/{ => bash}/lib_infra.sh (100%)
 rename infra/gcp/{ => bash}/lib_services.sh (100%)
 rename infra/gcp/{ => bash}/lib_util.sh (100%)
 rename infra/gcp/{ => bash}/namespaces/OWNERS (100%)
 rename infra/gcp/{ => bash}/namespaces/ensure-namespaces.sh (100%)
 rename infra/gcp/{ => bash}/namespaces/namespace-user-role-binding.yml (100%)
 rename infra/gcp/{ => bash}/namespaces/namespace-user-role.yml (100%)
 rename infra/gcp/{ => bash}/namespaces/namespace.yml (100%)
 rename infra/gcp/{ => bash}/prow/OWNERS (100%)
 rename infra/gcp/{ => bash}/prow/ensure-e2e-projects.sh (100%)
 rename infra/gcp/{ => bash}/roles/CustomRole.yaml (100%)
 rename infra/gcp/{ => bash}/roles/OWNERS (100%)
 rename infra/gcp/{ => bash}/roles/audit.viewer.yaml (100%)
 rename infra/gcp/{ => bash}/roles/container.deployer.yaml (100%)
 rename infra/gcp/{ => bash}/roles/generate-role-yaml.sh (100%)
 rename infra/gcp/{ => bash}/roles/iam.serviceAccountLister.yaml (100%)
 rename infra/gcp/{ => bash}/roles/organization.admin.yaml (100%)
 rename infra/gcp/{ => bash}/roles/prow.viewer.yaml (100%)
 rename infra/gcp/{ => bash}/roles/secretmanager.secretLister.yaml (100%)
 rename infra/gcp/{ => bash}/roles/specs/CustomRole.yaml (100%)
 rename infra/gcp/{ => bash}/roles/specs/audit.viewer.yaml (100%)
 rename infra/gcp/{ => bash}/roles/specs/container.deployer.yaml (100%)
 rename infra/gcp/{ => bash}/roles/specs/iam.serviceAccountLister.yaml (100%)
 rename infra/gcp/{ => bash}/roles/specs/organization.admin.yaml (100%)
 rename infra/gcp/{ => bash}/roles/specs/prow.viewer.yaml (100%)
 rename infra/gcp/{ => bash}/roles/specs/secretmanager.secretLister.yaml (100%)

diff --git a/audit/audit-gcp.sh b/audit/audit-gcp.sh
index ef7bdd94a55c..b920a3a4394f 100755
--- a/audit/audit-gcp.sh
+++ b/audit/audit-gcp.sh
@@ -38,7 +38,7 @@ set -o pipefail
 
 REPO_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)
 readonly REPO_ROOT
-. "${REPO_ROOT}/infra/gcp/lib.sh"
+. "${REPO_ROOT}/infra/gcp/bash/lib.sh"
 
 #
 # config
diff --git a/infra/gcp/backup_tools/OWNERS b/infra/gcp/bash/backup_tools/OWNERS
similarity index 100%
rename from infra/gcp/backup_tools/OWNERS
rename to infra/gcp/bash/backup_tools/OWNERS
diff --git a/infra/gcp/backup_tools/README.md b/infra/gcp/bash/backup_tools/README.md
similarity index 100%
rename from infra/gcp/backup_tools/README.md
rename to infra/gcp/bash/backup_tools/README.md
diff --git a/infra/gcp/backup_tools/backup.sh b/infra/gcp/bash/backup_tools/backup.sh
similarity index 100%
rename from infra/gcp/backup_tools/backup.sh
rename to infra/gcp/bash/backup_tools/backup.sh
diff --git a/infra/gcp/backup_tools/backup_images_expected.yaml b/infra/gcp/bash/backup_tools/backup_images_expected.yaml
similarity index 100%
rename from infra/gcp/backup_tools/backup_images_expected.yaml
rename to infra/gcp/bash/backup_tools/backup_images_expected.yaml
diff --git a/infra/gcp/backup_tools/backup_lib.sh b/infra/gcp/bash/backup_tools/backup_lib.sh
similarity index 100%
rename from infra/gcp/backup_tools/backup_lib.sh
rename to infra/gcp/bash/backup_tools/backup_lib.sh
diff --git a/infra/gcp/backup_tools/backup_prod.sh b/infra/gcp/bash/backup_tools/backup_prod.sh
similarity index 100%
rename from infra/gcp/backup_tools/backup_prod.sh
rename to infra/gcp/bash/backup_tools/backup_prod.sh
diff --git a/infra/gcp/backup_tools/backup_test.sh b/infra/gcp/bash/backup_tools/backup_test.sh
similarity index 100%
rename from infra/gcp/backup_tools/backup_test.sh
rename to infra/gcp/bash/backup_tools/backup_test.sh
diff --git a/infra/gcp/cip-auditor/OWNERS b/infra/gcp/bash/cip-auditor/OWNERS
similarity index 100%
rename from infra/gcp/cip-auditor/OWNERS
rename to infra/gcp/bash/cip-auditor/OWNERS
diff --git a/infra/gcp/cip-auditor/deploy.sh b/infra/gcp/bash/cip-auditor/deploy.sh
similarity index 100%
rename from infra/gcp/cip-auditor/deploy.sh
rename to infra/gcp/bash/cip-auditor/deploy.sh
diff --git a/infra/gcp/ensure-conformance-storage.sh b/infra/gcp/bash/ensure-conformance-storage.sh
similarity index 100%
rename from infra/gcp/ensure-conformance-storage.sh
rename to infra/gcp/bash/ensure-conformance-storage.sh
diff --git a/infra/gcp/ensure-env-cip-auditor.sh b/infra/gcp/bash/ensure-env-cip-auditor.sh
similarity index 100%
rename from infra/gcp/ensure-env-cip-auditor.sh
rename to infra/gcp/bash/ensure-env-cip-auditor.sh
diff --git a/infra/gcp/ensure-gsuite.sh b/infra/gcp/bash/ensure-gsuite.sh
similarity index 100%
rename from infra/gcp/ensure-gsuite.sh
rename to infra/gcp/bash/ensure-gsuite.sh
diff --git a/infra/gcp/ensure-main-project.sh b/infra/gcp/bash/ensure-main-project.sh
similarity index 100%
rename from infra/gcp/ensure-main-project.sh
rename to infra/gcp/bash/ensure-main-project.sh
diff --git a/infra/gcp/ensure-organization.sh b/infra/gcp/bash/ensure-organization.sh
similarity index 100%
rename from infra/gcp/ensure-organization.sh
rename to infra/gcp/bash/ensure-organization.sh
diff --git a/infra/gcp/ensure-prod-storage-gclb.sh b/infra/gcp/bash/ensure-prod-storage-gclb.sh
similarity index 100%
rename from infra/gcp/ensure-prod-storage-gclb.sh
rename to infra/gcp/bash/ensure-prod-storage-gclb.sh
diff --git a/infra/gcp/ensure-prod-storage.sh b/infra/gcp/bash/ensure-prod-storage.sh
similarity index 100%
rename from infra/gcp/ensure-prod-storage.sh
rename to infra/gcp/bash/ensure-prod-storage.sh
diff --git a/infra/gcp/ensure-release-projects.sh b/infra/gcp/bash/ensure-release-projects.sh
similarity index 100%
rename from infra/gcp/ensure-release-projects.sh
rename to infra/gcp/bash/ensure-release-projects.sh
diff --git a/infra/gcp/ensure-releng.sh b/infra/gcp/bash/ensure-releng.sh
similarity index 100%
rename from infra/gcp/ensure-releng.sh
rename to infra/gcp/bash/ensure-releng.sh
diff --git a/infra/gcp/ensure-staging-storage.sh b/infra/gcp/bash/ensure-staging-storage.sh
similarity index 100%
rename from infra/gcp/ensure-staging-storage.sh
rename to infra/gcp/bash/ensure-staging-storage.sh
diff --git a/infra/gcp/infra.yaml b/infra/gcp/bash/infra.yaml
similarity index 100%
rename from infra/gcp/infra.yaml
rename to infra/gcp/bash/infra.yaml
diff --git a/infra/gcp/lib.sh b/infra/gcp/bash/lib.sh
similarity index 100%
rename from infra/gcp/lib.sh
rename to infra/gcp/bash/lib.sh
diff --git a/infra/gcp/lib_gcr.sh b/infra/gcp/bash/lib_gcr.sh
similarity index 100%
rename from infra/gcp/lib_gcr.sh
rename to infra/gcp/bash/lib_gcr.sh
diff --git a/infra/gcp/lib_gcs.sh b/infra/gcp/bash/lib_gcs.sh
similarity index 100%
rename from infra/gcp/lib_gcs.sh
rename to infra/gcp/bash/lib_gcs.sh
diff --git a/infra/gcp/lib_gsm.sh b/infra/gcp/bash/lib_gsm.sh
similarity index 100%
rename from infra/gcp/lib_gsm.sh
rename to infra/gcp/bash/lib_gsm.sh
diff --git a/infra/gcp/lib_iam.sh b/infra/gcp/bash/lib_iam.sh
similarity index 100%
rename from infra/gcp/lib_iam.sh
rename to infra/gcp/bash/lib_iam.sh
diff --git a/infra/gcp/lib_infra.sh b/infra/gcp/bash/lib_infra.sh
similarity index 100%
rename from infra/gcp/lib_infra.sh
rename to infra/gcp/bash/lib_infra.sh
diff --git a/infra/gcp/lib_services.sh b/infra/gcp/bash/lib_services.sh
similarity index 100%
rename from infra/gcp/lib_services.sh
rename to infra/gcp/bash/lib_services.sh
diff --git a/infra/gcp/lib_util.sh b/infra/gcp/bash/lib_util.sh
similarity index 100%
rename from infra/gcp/lib_util.sh
rename to infra/gcp/bash/lib_util.sh
diff --git a/infra/gcp/namespaces/OWNERS b/infra/gcp/bash/namespaces/OWNERS
similarity index 100%
rename from infra/gcp/namespaces/OWNERS
rename to infra/gcp/bash/namespaces/OWNERS
diff --git a/infra/gcp/namespaces/ensure-namespaces.sh b/infra/gcp/bash/namespaces/ensure-namespaces.sh
similarity index 100%
rename from infra/gcp/namespaces/ensure-namespaces.sh
rename to infra/gcp/bash/namespaces/ensure-namespaces.sh
diff --git a/infra/gcp/namespaces/namespace-user-role-binding.yml b/infra/gcp/bash/namespaces/namespace-user-role-binding.yml
similarity index 100%
rename from infra/gcp/namespaces/namespace-user-role-binding.yml
rename to infra/gcp/bash/namespaces/namespace-user-role-binding.yml
diff --git a/infra/gcp/namespaces/namespace-user-role.yml b/infra/gcp/bash/namespaces/namespace-user-role.yml
similarity index 100%
rename from infra/gcp/namespaces/namespace-user-role.yml
rename to infra/gcp/bash/namespaces/namespace-user-role.yml
diff --git a/infra/gcp/namespaces/namespace.yml b/infra/gcp/bash/namespaces/namespace.yml
similarity index 100%
rename from infra/gcp/namespaces/namespace.yml
rename to infra/gcp/bash/namespaces/namespace.yml
diff --git a/infra/gcp/prow/OWNERS b/infra/gcp/bash/prow/OWNERS
similarity index 100%
rename from infra/gcp/prow/OWNERS
rename to infra/gcp/bash/prow/OWNERS
diff --git a/infra/gcp/prow/ensure-e2e-projects.sh b/infra/gcp/bash/prow/ensure-e2e-projects.sh
similarity index 100%
rename from infra/gcp/prow/ensure-e2e-projects.sh
rename to infra/gcp/bash/prow/ensure-e2e-projects.sh
diff --git a/infra/gcp/roles/CustomRole.yaml b/infra/gcp/bash/roles/CustomRole.yaml
similarity index 100%
rename from infra/gcp/roles/CustomRole.yaml
rename to infra/gcp/bash/roles/CustomRole.yaml
diff --git a/infra/gcp/roles/OWNERS b/infra/gcp/bash/roles/OWNERS
similarity index 100%
rename from infra/gcp/roles/OWNERS
rename to infra/gcp/bash/roles/OWNERS
diff --git a/infra/gcp/roles/audit.viewer.yaml b/infra/gcp/bash/roles/audit.viewer.yaml
similarity index 100%
rename from infra/gcp/roles/audit.viewer.yaml
rename to infra/gcp/bash/roles/audit.viewer.yaml
diff --git a/infra/gcp/roles/container.deployer.yaml b/infra/gcp/bash/roles/container.deployer.yaml
similarity index 100%
rename from infra/gcp/roles/container.deployer.yaml
rename to infra/gcp/bash/roles/container.deployer.yaml
diff --git a/infra/gcp/roles/generate-role-yaml.sh b/infra/gcp/bash/roles/generate-role-yaml.sh
similarity index 100%
rename from infra/gcp/roles/generate-role-yaml.sh
rename to infra/gcp/bash/roles/generate-role-yaml.sh
diff --git a/infra/gcp/roles/iam.serviceAccountLister.yaml b/infra/gcp/bash/roles/iam.serviceAccountLister.yaml
similarity index 100%
rename from infra/gcp/roles/iam.serviceAccountLister.yaml
rename to infra/gcp/bash/roles/iam.serviceAccountLister.yaml
diff --git a/infra/gcp/roles/organization.admin.yaml b/infra/gcp/bash/roles/organization.admin.yaml
similarity index 100%
rename from infra/gcp/roles/organization.admin.yaml
rename to infra/gcp/bash/roles/organization.admin.yaml
diff --git a/infra/gcp/roles/prow.viewer.yaml b/infra/gcp/bash/roles/prow.viewer.yaml
similarity index 100%
rename from infra/gcp/roles/prow.viewer.yaml
rename to infra/gcp/bash/roles/prow.viewer.yaml
diff --git a/infra/gcp/roles/secretmanager.secretLister.yaml b/infra/gcp/bash/roles/secretmanager.secretLister.yaml
similarity index 100%
rename from infra/gcp/roles/secretmanager.secretLister.yaml
rename to infra/gcp/bash/roles/secretmanager.secretLister.yaml
diff --git a/infra/gcp/roles/specs/CustomRole.yaml b/infra/gcp/bash/roles/specs/CustomRole.yaml
similarity index 100%
rename from infra/gcp/roles/specs/CustomRole.yaml
rename to infra/gcp/bash/roles/specs/CustomRole.yaml
diff --git a/infra/gcp/roles/specs/audit.viewer.yaml b/infra/gcp/bash/roles/specs/audit.viewer.yaml
similarity index 100%
rename from infra/gcp/roles/specs/audit.viewer.yaml
rename to infra/gcp/bash/roles/specs/audit.viewer.yaml
diff --git a/infra/gcp/roles/specs/container.deployer.yaml b/infra/gcp/bash/roles/specs/container.deployer.yaml
similarity index 100%
rename from infra/gcp/roles/specs/container.deployer.yaml
rename to infra/gcp/bash/roles/specs/container.deployer.yaml
diff --git a/infra/gcp/roles/specs/iam.serviceAccountLister.yaml b/infra/gcp/bash/roles/specs/iam.serviceAccountLister.yaml
similarity index 100%
rename from infra/gcp/roles/specs/iam.serviceAccountLister.yaml
rename to infra/gcp/bash/roles/specs/iam.serviceAccountLister.yaml
diff --git a/infra/gcp/roles/specs/organization.admin.yaml b/infra/gcp/bash/roles/specs/organization.admin.yaml
similarity index 100%
rename from infra/gcp/roles/specs/organization.admin.yaml
rename to infra/gcp/bash/roles/specs/organization.admin.yaml
diff --git a/infra/gcp/roles/specs/prow.viewer.yaml b/infra/gcp/bash/roles/specs/prow.viewer.yaml
similarity index 100%
rename from infra/gcp/roles/specs/prow.viewer.yaml
rename to infra/gcp/bash/roles/specs/prow.viewer.yaml
diff --git a/infra/gcp/roles/specs/secretmanager.secretLister.yaml b/infra/gcp/bash/roles/specs/secretmanager.secretLister.yaml
similarity index 100%
rename from infra/gcp/roles/specs/secretmanager.secretLister.yaml
rename to infra/gcp/bash/roles/specs/secretmanager.secretLister.yaml