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.

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

terraform: cleanup prow terraform #2850

Merged
merged 6 commits into from
Sep 29, 2021

Conversation

spiffxp
Copy link
Member

@spiffxp spiffxp commented Sep 29, 2021

Related:

Miscellaneous cleanup for both prow projects

The goal in splitting up is to point someone looking to add a new secret or service account to a file that looks much less scary than a single monolithic terraform file

Specifically:

- merge locals blocks
- move workload_identity_service_accounts from list to map
- terraform fmt
- fix typo in wisa module invocation
- depend on module.project.project_id
Specifically:

- merge locals blocks
- concert workload_identity_service_accounts to map
- terraform fmt
- fixup wisa module invocation
- depend on module.project.project_id
Move resources out of main.tf into their own files to reduce the set of
resources someone needs to look at all at once to make a change

- secrets.tf
- serviceaccounts.tf
- external-ips.tf
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 29, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: spiffxp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 29, 2021
@k8s-ci-robot k8s-ci-robot added area/bash Bash scripts, testing them, writing less of them, code in infra/gcp/ area/infra Infrastructure management, infrastructure design, code in infra/ area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters area/terraform Terraform modules, testing them, writing more of them, code in infra/gcp/clusters/ sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Sep 29, 2021
Move resources out of main.tf into their own files to reduce the set of
resources someone needs to look at all at once to make a change

- secrets.tf
- serviceaccounts.tf
- external-ips.tf
@spiffxp spiffxp force-pushed the cleanup-prow-terraform branch from 09ed0d1 to 674eec8 Compare September 29, 2021 14:06
@spiffxp
Copy link
Member Author

spiffxp commented Sep 29, 2021

/cc @ameukam @rikatz

@dims
Copy link
Member

dims commented Sep 29, 2021

/lgtm
/hold

please remove hold when ready @spiffxp (or if you need additional eyes)

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 29, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 29, 2021
@ameukam
Copy link
Member

ameukam commented Sep 29, 2021

/lgtm

@spiffxp
Copy link
Member Author

spiffxp commented Sep 29, 2021

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 29, 2021
@k8s-ci-robot k8s-ci-robot merged commit 21cd4bd into kubernetes:main Sep 29, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Sep 29, 2021
@spiffxp spiffxp deleted the cleanup-prow-terraform branch September 29, 2021 14:51
@spiffxp
Copy link
Member Author

spiffxp commented Sep 29, 2021

Ran terraform apply in k8s-infra-prow-build-trusted and k8s-infra-prow-build

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/bash Bash scripts, testing them, writing less of them, code in infra/gcp/ area/infra Infrastructure management, infrastructure design, code in infra/ area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters area/terraform Terraform modules, testing them, writing more of them, code in infra/gcp/clusters/ cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants