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

Jump to bottom

terraform: Fix resource formatting for IPv6 CIDRs #5979

Merged
merged 2 commits into from
Oct 20, 2018
Merged

terraform: Fix resource formatting for IPv6 CIDRs #5979

merged 2 commits into from
Oct 20, 2018

Conversation

a8m
Copy link
Contributor

@a8m a8m commented Oct 20, 2018

Solved #5976

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 20, 2018
chrisz100
chrisz100 reviewed Oct 20, 2018
View reviewed changes
Copy link
Contributor

@chrisz100 chrisz100 left a comment

Choose a reason for hiding this comment

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

Thanks @a8m - can you please fix the travis ci problem before we activate other tests?

tests/integration/update_cluster/restrict_access/id_rsa.pub
@@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ==
Copy link
Contributor

Choose a reason for hiding this comment

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

Who owns this key? What is it for?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the same key that is used by all integration tests. For example, the shared vpc test. If you remove it, the test will fail with the following error:

--- FAIL: TestRestrictAccess (0.01s)
    integration_test.go:238: error running "in-v1alpha2.yaml" create: error reading SSH public key
    ....

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, it's a little annoying, but it's just a one-off key I generated. It isn't used for anything but the tests.

@a8m
integration: Fix broken test in externallb
d63c471 
Running `terraform validate` on `externallb/kubernetes.tf` was failing
because resource name can't contain ":".
@a8m
Copy link
Contributor Author

a8m commented Oct 20, 2018

One of the tests was failing after my changes. I fixed it.
Running terraform validate on this file (before my changes) was failing with the following error:

Error: aws_autoscaling_attachment.exttg-aws:my-tg--0123456789abcdef-master-us-test-1a: 
exttg-aws:my-tg--0123456789abcdef-master-us-test-1a: resource name can only contain
letters, numbers, dashes, and underscores.

The problem was that kops was generating invalid terraform files. My suggestions is to run terraform validate as part of the integration tests. But this can be made in a different PR.

@chrisz100
Copy link
Contributor

/ok-to-test
/lgtm

/assign @justinsb

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 20, 2018
justinsb
justinsb reviewed Oct 20, 2018
View reviewed changes
tests/integration/update_cluster/restrict_access/in-v1alpha2.yaml
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 1.1.1.1/0
- 2001:0:85a3::/40
Copy link
Member

Choose a reason for hiding this comment

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

You probably could have just added this to complex, which is a sort of grab-bag for random things. But this works :-)

@justinsb
Copy link
Member

Thanks @a8m

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: a8m, chrisz100, justinsb

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 20, 2018
@k8s-ci-robot k8s-ci-robot merged commit ad25ff7 into kubernetes:master Oct 20, 2018
@a8m a8m mentioned this pull request Oct 20, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinsb justinsb justinsb left review comments

@chrisz100 chrisz100 chrisz100 left review comments

@rdrgmnzs rdrgmnzs Awaiting requested review from rdrgmnzs

Assignees

@justinsb justinsb

@chrisz100 chrisz100

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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@a8m @chrisz100 @justinsb @k8s-ci-robot