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

GCE: support egress specification #12600

Merged
merged 1 commit into from
Oct 27, 2021
Merged

Conversation

justinsb
Copy link
Member

Empty or "nat" now defaults to creating a per-subnet NAT router for
private topologies. "external" will assume that egress is configured
outside of kOps.

Issue #12563

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 24, 2021
@zetaab
Copy link
Member

zetaab commented Oct 26, 2021

@justinsb overall looks good, please fix the terraform part and good to go

upup/pkg/fi/cloudup/gcetasks/router.go:231:31: subnet.TerraformLink undefined (type *Subnet has no field or method TerraformLink)

@@ -188,6 +226,12 @@ func (*Router) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Rout
NATIPAllocateOption: e.NATIPAllocationOption,
SourceSubnetworkIPRangesToNat: e.SourceSubnetworkIPRangesToNAT,
}
for _, subnet := range e.Subnetworks {
trn.Subnetworks = append(trn.Subnetworks, &terraformRouterNatSubnetwork{
Name: subnet.TerraformLink(),
Copy link
Member

@rifelpet rifelpet Oct 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Name: subnet.TerraformLink(),
Name: subnet.TerraformName(),

func (i *Subnet) TerraformName() *terraformWriter.Literal {
return terraformWriter.LiteralProperty("google_compute_subnetwork", *i.Name, "name")
}

Empty or "nat" now defaults to creating a per-subnet NAT router for
private topologies.  "external" will assume that egress is configured
outside of kOps.
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 27, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rifelpet

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 Oct 27, 2021
@rifelpet
Copy link
Member

prow job pod timeout :(

/retest

@rifelpet
Copy link
Member

I wonder if the pod is being OOMkilled. the job doesn't have a memory limit in place

/retest

@k8s-ci-robot k8s-ci-robot merged commit d8ea6aa into kubernetes:master Oct 27, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Oct 27, 2021
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. 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants