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

cleanup infra/gcp/terraform mv detritus #2485

Merged
merged 1 commit into from
Aug 6, 2021
Merged

cleanup infra/gcp/terraform mv detritus #2485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion audit/check-audit-pr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ function check_container() {
project=$(echo "${f}" | cut -d/ -f2)
if [[ "${f}" =~ services/container/clusters/[a-z-]*.json ]]; then
cluster=$(basename "${f}" .json)
cluster_tf_dir="${REPO_ROOT}/infra/gcp/terraform/${project}${cluster}"
cluster_tf_dir="${REPO_ROOT}/infra/gcp/terraform/${project}/${cluster}"
if [ -d "${cluster_tf_dir}" ]; then
echo "PASS: ${project} has container cluster resource ${cluster} is expected, auto-accepting for now"
else
Expand Down
8 changes: 4 additions & 4 deletions hack/autobump-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ gitHubRepo: "k8s.io"
remoteName: "k8s.io"
upstreamURLBase: "https://raw.githubusercontent.com/kubernetes/k8s.io/main"
includedConfigPaths:
- "infra/gcp/terraform/k8s-infra-prow-buildprow-build/resources"
- "infra/gcp/terraform/k8s-infra-prow-build-trustedprow-build-trusted/resources"
- "infra/gcp/terraform/k8s-infra-prow-build/prow-build/resources"
- "infra/gcp/terraform/k8s-infra-prow-build-trusted/prow-build-trusted/resources"
excludedConfigPaths:
- "k8s.gcr.io"
extraFiles:
Expand All @@ -19,12 +19,12 @@ targetVersion: "latest"
prefixes:
- name: "ghproxy"
prefix: "gcr.io/k8s-prow/ghproxy"
refConfigFile: "infra/gcp/terraform/k8s-infra-prow-build-trustedprow-build-trusted/resources/ghproxy-deployment.yaml"
refConfigFile: "infra/gcp/terraform/k8s-infra-prow-build-trusted/prow-build-trusted/resources/ghproxy-deployment.yaml"
repo: "https://github.com/kubernetes/test-infra"
summarise: false
- name: "boskos"
prefix: "gcr.io/k8s-staging-boskos/"
refConfigFile: "infra/gcp/terraform/k8s-infra-prow-buildprow-build/resources/boskos.yaml"
refConfigFile: "infra/gcp/terraform/k8s-infra-prow-build/prow-build/resources/boskos.yaml"
repo: "https://github.com/kubernetes-sigs/boskos"
summarise: false
consistentImages: true
60 changes: 0 additions & 60 deletions hack/mv-clusters-terraform.sh
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions infra/gcp/infra.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ infra:
prow:
projects:
k8s-infra-prow-build:
managed_by: infra/gcp/terraform/k8s-infra-prow-buildprow-build/main.tf
managed_by: infra/gcp/terraform/k8s-infra-prow-build/main.tf
k8s-infra-prow-build-trusted:
managed_by: infra/gcp/terraform/k8s-infra-prow-build-trustedprow-build-trusted/main.tf
managed_by: infra/gcp/terraform/k8s-infra-prow-build-trusted/main.tf

public:
projects:
Expand All @@ -250,7 +250,7 @@ infra:
sandbox:
projects:
k8s-infra-ii-sandbox:
managed_by: infra/gcp/terraform/k8s-infra-ii-sandboxmain.tf
managed_by: infra/gcp/terraform/k8s-infra-ii-sandbox/main.tf

staging:
managed_by: infra/gcp/ensure-staging-storage.sh
Expand Down
5 changes: 2 additions & 3 deletions infra/gcp/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,8 @@ readonly PROW_TRUSTED_BUILD_CLUSTER_PROJECTS=(
# to be kept consistent across a few places:
#
# - https://git.k8s.io/test-infra/config/prow/config.yaml # pod_namespace: test-pods
# - infra/gcp/terraform/k8s-infra-prow-**/main.tf # pod_namespace = test-pods
# # TODO: not all resources belong in test-pods, would be good to shard into folders
# - infra/gcp/terraform/k8s-infra-prow-**/resources/* # namespace: test-pods
# - infra/gcp/terraform/k8s-infra-prow-*/main.tf # pod_namespace = test-pods
# - infra/gcp/terraform/k8s-infra-prow-*/*/resources/test-pods # namespace: test-pods
# used in: ensure-gsuite.sh ensure-main-project.sh ensure-prod-storage.sh ensure-staging-storage.sh
export PROWJOB_POD_NAMESPACE="test-pods"

Expand Down