-
Notifications
You must be signed in to change notification settings - Fork 69
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
Initial module implementation #1
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Summary
Blockers:
- Update
terraform
Docker image to build successfully - Convert IAM resources to be additive, not authoritative
- Verify behavior around worker startup script, and possibly add test coverage
- Amend test setup documentation
Standards conformance:
- Quote boolean barewords as strings for v0.12
Review:
[x] Verify behavior around shared VPCs and firewall rules - or push shared VPC support to a later PRDeferred[x] Consider merging firewall rules into a single rule
Suggestions:
- Rename
gce.tf
tomain.tf
- Merge
jenkins.tf
andgce.tf
/main.tf
iam.tf
Outdated
members = ["serviceAccount:${google_service_account.jenkins.email}"] | ||
} | ||
|
||
resource "google_project_iam_binding" "jenkins-network_admin" { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What would happen if a shared VPC would be used?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an old review that didn't get posted so these comments may be out of date. When I ran through the integration tests I had some issues building the packer image. If this PR is ready for more functional review we can dig into this next week.
@Jberlinsky checking in - would you like me to do another review pass or would you like to get more work on it first? |
@adrienthebo Working on the current tranche of feedback now -- I'll ping you shortly for re-review :) |
@adrienthebo Might I suggest that we extract concerns related to shared VPCs to a separate PR, and proceed with reviewing this one as it stands? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Summary
Previous review (#1 (review)) - fully addressed
Blockers
- (trivial) We shouldn't attach the default compute service account when building the image; a patch has been added to fix this.
Suggested
- (trivial) Drop the
docker_build_kitchen_terraform
dep from thedocker_create
target; an inline suggestion will fix this.
Defer
- Shared VPC configuration
- Control over Jenkins instance service accounts
Soft 👍 , let's get that fixup for Packer definition dealing with the default compute service account. Bonus points for the Makefile fixup, but it's a nonblocker. Ping me when the blocker has been resolved and let's get this merged!
@adrienthebo Ready for one more pass :) |
Updates made, needs an additional pass.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! @morgante do you want to review this before we merge it?
Pinging @morgante |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just some minor nits, I've also moved non-blockers out into issues.
@morgante I've address the issues mentioned here, would appreciate if you could take a final look so we can get this PR merged in! |
Notable design decisions that need addressing, but shouldn't prevent an initial implementation:
jenkins
service account, and does not allow a user-created one to be passed in. This should probably follow a similar pattern to the one proposed in Create a service account for nodes if one isn't provided. terraform-google-kubernetes-engine#2TODO