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

Add deployment example #4126

Merged
merged 13 commits into from
Jan 11, 2022
Merged

Conversation

stevesloka
Copy link
Member

  • Adds an example for running Envoy as a deployment vs a daemonset
  • Updates the e2e tests to read an env var to determine if the deployment version should be run
  • Enables running e2e tests for Envoy deployment on each PR build (😱)

@stevesloka stevesloka added the release-note/none-required Marks a PR as not requiring a release note. Should only be used for very small changes. label Oct 20, 2021
@stevesloka stevesloka requested a review from a team as a code owner October 20, 2021 20:38
@stevesloka stevesloka requested review from skriss and sunjayBhatia and removed request for a team October 20, 2021 20:38
@stevesloka stevesloka force-pushed the addDeploymentExample branch from e449db6 to 6f112c8 Compare October 20, 2021 20:42
@stevesloka stevesloka added release-note/minor A minor change that needs about a paragraph of explanation in the release notes. and removed release-note/none-required Marks a PR as not requiring a release note. Should only be used for very small changes. labels Oct 20, 2021
@codecov
Copy link

codecov bot commented Oct 20, 2021

Codecov Report

Merging #4126 (13c97a7) into main (4f025fe) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4126      +/-   ##
==========================================
- Coverage   77.78%   77.77%   -0.02%     
==========================================
  Files         112      112              
  Lines       10005    10005              
==========================================
- Hits         7782     7781       -1     
- Misses       2040     2041       +1     
  Partials      183      183              
Impacted Files Coverage Δ
internal/sorter/sorter.go 98.18% <0.00%> (-0.61%) ⬇️

@stevesloka stevesloka added release-note/small A small change that needs one line of explanation in the release notes. release-note/minor A minor change that needs about a paragraph of explanation in the release notes. and removed release-note/minor A minor change that needs about a paragraph of explanation in the release notes. release-note/small A small change that needs one line of explanation in the release notes. labels Oct 20, 2021
@stevesloka
Copy link
Member Author

I thought about just having the deployment version run hourly or something to pick up issues vs running on each PR. That might reduce the churn time for each iteration.

@github-actions
Copy link

github-actions bot commented Nov 4, 2021

Marking this PR stale since there has been no activity for 14 days. It will be closed if there is no activity for another 30 days.

@github-actions github-actions bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 4, 2021
Copy link
Member

@skriss skriss left a comment

Choose a reason for hiding this comment

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

👍 to having this as an example. It'd also be good to update examples/contour/README.md, as well as some stuff in the docs about deployment options (e.g. https://projectcontour.io/docs/v1.19.1/deploy-options/, maybe some other pages too)

.github/workflows/prbuild.yaml Outdated Show resolved Hide resolved
examples/contour/03-envoy-deployment.yaml Outdated Show resolved Hide resolved
Copy link
Member

@youngnick youngnick left a comment

Choose a reason for hiding this comment

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

LGTM, I agree with @skriss about the risk of burning all our Actions time if we have a few PRs though.

.github/workflows/prbuild.yaml Outdated Show resolved Hide resolved
@sunjayBhatia sunjayBhatia removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 8, 2021
@stevesloka stevesloka force-pushed the addDeploymentExample branch 3 times, most recently from 0139066 to 3dfad38 Compare November 18, 2021 03:06
@stevesloka stevesloka requested a review from skriss November 19, 2021 17:39
@stevesloka
Copy link
Member Author

@skriss @sunjayBhatia I refactored this a bit to add some "deployment" tests. I'd like to write up some docs, but can follow that up with a new PR.

@sunjayBhatia
Copy link
Member

ah @stevesloka just merged #4170 and realized there will be merge conflicts now, my apologies

@stevesloka stevesloka force-pushed the addDeploymentExample branch from abfdf67 to 1ba7616 Compare December 1, 2021 16:37
@stevesloka
Copy link
Member Author

No worries @sunjayBhatia, all rebased!

@github-actions
Copy link

Marking this PR stale since there has been no activity for 14 days. It will be closed if there is no activity for another 30 days.

@github-actions github-actions bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 16, 2021
@stevesloka stevesloka removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 16, 2021
@sunjayBhatia sunjayBhatia self-requested a review December 16, 2021 21:47
Copy link
Member

@skriss skriss left a comment

Choose a reason for hiding this comment

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

This looks pretty good, one small merge conflict to resolve. I do think de-duping the tests would be good, but maybe we can do that in a follow-up for the sake of getting this in.

test/e2e/framework.go Outdated Show resolved Hide resolved
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func testPathConditionMatch(namespace string) {
Copy link
Member

Choose a reason for hiding this comment

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

If we wanted to get this in as-is, I'd be willing to take the follow-up to do some de-duplication here.

Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
Signed-off-by: Steve Sloka <slokas@vmware.com>
@stevesloka stevesloka force-pushed the addDeploymentExample branch from 1ba7616 to 218d63a Compare January 7, 2022 20:00
@stevesloka
Copy link
Member Author

If we wanted to get this in as-is, I'd be willing to take the follow-up to do some de-duplication here.

@skriss @sunjayBhatia I think that's a good plan, merge this in and we can refactor everything around maybe. What do you think?

Signed-off-by: Steve Sloka <slokas@vmware.com>
@skriss
Copy link
Member

skriss commented Jan 7, 2022

If we wanted to get this in as-is, I'd be willing to take the follow-up to do some de-duplication here.

@skriss @sunjayBhatia I think that's a good plan, merge this in and we can refactor everything around maybe. What do you think?

It works for me. I was thinking that maybe another path here would be to run the full suite of E2E's against a Deployment as part of the daily run, so we could make a decision on that and then make some subsequent revisions here.

@stevesloka
Copy link
Member Author

I'm inclined to just merge this, then I'll add it to the daily build to help validate. Just want to check in with you @sunjayBhatia if that makes sense.

@sunjayBhatia
Copy link
Member

I'm inclined to just merge this, then I'll add it to the daily build to help validate. Just want to check in with you @sunjayBhatia if that makes sense.

sounds good to me 👍🏽 good to get changes in and then we can refactor the CI as needed

@skriss skriss merged commit e1f295b into projectcontour:main Jan 11, 2022
@stevesloka stevesloka deleted the addDeploymentExample branch January 12, 2022 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/minor A minor change that needs about a paragraph of explanation in the release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants