Skip to content

Make frontend resource deletion test verify that ingress VIP is unchanged #995

Merged
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
skmatti:e2e-test-fix
Jan 23, 2020
Merged

Make frontend resource deletion test verify that ingress VIP is unchanged #995
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
skmatti:e2e-test-fix

Conversation

@skmatti
Copy link
Copy Markdown
Contributor

@skmatti skmatti commented Jan 16, 2020

Extends existing e2e test to cover bug: #993

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 16, 2020
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jan 16, 2020

Hi @skmatti. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@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/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 16, 2020
@skmatti
Copy link
Copy Markdown
Contributor Author

skmatti commented Jan 17, 2020

/assign @freehan
Tested this and confirmed that it works on dev setup.

freehan
freehan reviewed Jan 17, 2020
View reviewed changes
cmd/e2e-test/basic_test.go
t.Fatalf("Update(%s) = %v, want nil; ingress: %v", ingKey, err, ing)
}
t.Logf("Ingress updated (%s)", ingKey)
if ing, err = e2e.WaitForIngress(s, ing, &e2e.WaitForIngressOptions{ExpectUnreachable: true}); err != nil {
Copy link
Copy Markdown
Contributor

@freehan freehan Jan 17, 2020

Choose a reason for hiding this comment

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

I am wondering if this would be waiting for LB config to be reconfigured. I think it would not. It will pass immediately after ingress is updated. Can you confirm?

Copy link
Copy Markdown
Contributor Author

@skmatti skmatti Jan 17, 2020

Choose a reason for hiding this comment

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

It may just work fine in this case. WaitForIngress validates both http and https paths.

ingress-gce/pkg/fuzz/validator.go

Lines 120 to 126 in 7ac5f47

// baseAttributes apply settings for the vanilla Ingress spec.
func (a *IngressValidatorAttributes) baseAttributes(ing *v1beta1.Ingress) {
a.CheckHTTP = true
if len(ing.Spec.TLS) != 0 {
a.CheckHTTPS = true
}
}

Here, I am enabling both http and https back again. So, it should wait for both checks to be validated.

Copy link
Copy Markdown
Contributor

@freehan freehan Jan 17, 2020

Choose a reason for hiding this comment

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

got it.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 17, 2020
freehan
freehan reviewed Jan 17, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@freehan freehan left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

cmd/e2e-test/basic_test.go
t.Fatalf("Update(%s) = %v, want nil; ingress: %v", ingKey, err, ing)
}
t.Logf("Ingress updated (%s)", ingKey)
if ing, err = e2e.WaitForIngress(s, ing, &e2e.WaitForIngressOptions{ExpectUnreachable: true}); err != nil {
Copy link
Copy Markdown
Contributor

@freehan freehan Jan 17, 2020

Choose a reason for hiding this comment

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

got it.

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 17, 2020
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 18, 2020
@freehan
Copy link
Copy Markdown
Contributor

freehan commented Jan 23, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 23, 2020
@freehan
Copy link
Copy Markdown
Contributor

freehan commented Jan 23, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 23, 2020
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jan 23, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: freehan, skmatti

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

The pull request process is described here

Details 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 merged commit 50924ce into kubernetes:master Jan 23, 2020
@skmatti skmatti deleted the e2e-test-fix branch February 24, 2020 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rramkumar1 rramkumar1 Awaiting requested review from rramkumar1

@thockin thockin Awaiting requested review from thockin

1 more reviewer

@freehan freehan freehan left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@freehan freehan

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@skmatti @k8s-ci-robot @freehan