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

Add Varnish #309

Merged
merged 39 commits into from
Jun 18, 2020
Merged

Add Varnish #309

merged 39 commits into from
Jun 18, 2020

Conversation

kierenevans
Copy link
Contributor

@kierenevans kierenevans commented Jun 1, 2020 •
edited
Loading

If varnish is in the list of services:

  • Use varnish as the entrypoint from traefik.
  • Use tls-offload as the target for acceptance testing (behat) within the docker-compose environment to provide TLS support.
  • Deploy varnish statefulset to pipeline environments as the entrypoint from the ingress.
  • Deploy a configmap containing the varnish configuration, to avoid wiping out the cache on each deployment if built with docker image+configuration per-commit.
  • Configure the "timeout chain" of varnish and nginx to be the max execution time of php plus one or two seconds. The idea is to never show a 502/504 when php is still working, though this may not be true if PHP is performing slow network requests as they block and don't count towards max_execution_time, or if the queue to access php-fpm from nginx is high.
  • BREAKING CHANGE: .Values.ingress renamed to .Values.ingress.type to allow for more ingress configurations.
  • Magento 2 VCL from https://github.com/magento/magento2/blob/2.3.5/app/code/Magento/PageCache/etc/varnish6.vcl used as the configuration.
  • Magento 2 env.php configured for http_cache_hosts

Fixes #14

@kierenevans kierenevans added enhancement New feature or request wip Good for newcomers harness-all Changes required to all harness directories breaking Breaking change, next major release only labels Jun 1, 2020
@kierenevans kierenevans force-pushed the feature/add-varnish-entrypoint branch from b5efe80 to 094bd01 Compare June 2, 2020 09:31
@kierenevans kierenevans marked this pull request as ready for review June 2, 2020 10:47
@kierenevans kierenevans added wip Good for newcomers and removed wip Good for newcomers labels Jun 2, 2020
@kierenevans kierenevans force-pushed the feature/add-varnish-entrypoint branch from d3981ce to 48e2243 Compare June 2, 2020 10:52
@kierenevans kierenevans removed the wip Good for newcomers label Jun 2, 2020
tkotosz
tkotosz previously approved these changes Jun 5, 2020
View reviewed changes
Copy link

@tkotosz tkotosz left a comment

Choose a reason for hiding this comment

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

generally looks good to me. @dcole-inviqa could you please have a look at this, just to be on the safe side since it is a breaking change?

@tkotosz tkotosz requested a review from coledave June 5, 2020 07:40
@kierenevans kierenevans added this to the 0.8.0 milestone Jun 9, 2020
@kierenevans kierenevans force-pushed the feature/add-varnish-entrypoint branch 2 times, most recently from 43aa908 to 5935b6a Compare June 18, 2020 07:11
kierenevans added 13 commits June 18, 2020 10:25
@kierenevans
Stop routing to NGINX from traefik if varnish is present
dedca25
@kierenevans
Add optional varnish service
8bcb1a7
@kierenevans
Add varnish dockerfile
eb6db02
@kierenevans
Define default max_execution_time so we can pick it up in nginx and
b18c0de 
varnish
@kierenevans
Set max_execution_time - varying from the default 30s where there was…
a9eac38 
… already variance
@kierenevans
Add default varnish configuration from docker image, customised for n…
fd403d0 
…ginx
@kierenevans
Add customised varnish configuration for magento2 based on https://gi…
a74c3e6 
…thub.com/magento/magento2/blob/2.3.5/app/code/Magento/PageCache/etc/varnish6.vcl
@kierenevans
Let Kubernetes handle the magento2 healthcheck
d962769
@kierenevans
Test with varnish
df73fc3
@kierenevans
Convert from built image which would change per-commit, to something we
829cc77 
can drive with a configmap
@kierenevans
Render via twig
e8a2005
@kierenevans
Fix for type issue for varnish seconds
a2d5c7f
@kierenevans
Fix shellcheck issues in config_render.sh.twig
ce07a53
kierenevans added 25 commits June 18, 2020 10:26
@kierenevans
Change service target when using varnish
5bda522
@kierenevans
Add helm deployment for varnish
cb7eaee
@kierenevans
Bring in the varnish configuration used by docker as a configmap.
c672470 
This setup allows us to update the configuration without losing the
cache
@kierenevans
Define .Values.services.varnish
f3d141c
@kierenevans
Fix using non-twig syntax in twig file
d64b446
@kierenevans
Fix not being able to embed files with "../"
c3c990e
@kierenevans
Fix template being invalid
4098fae
@kierenevans
Fix .twig file being used in helm chart
7eb1679
@kierenevans
Fix typo in ingress targetService
18f5696
@kierenevans
BREAKING: Fix type error - move ingress: "standard/istio" to ingress.…
9beb4e5 
…type
@kierenevans
Bring up multiple varnish's at once, we only use statefulset for
f17b509 
consistent naming
@kierenevans
Remove invalid status: {} - a StatefulSet needs status.replicas set
b9fec8f
@kierenevans
Support multiple replicas for varnish. Configure magento2
079be82
@kierenevans
Fix replicas being missing from values
0dfa597
@kierenevans
Use yaml directly
8a775b0
@kierenevans
Set magento2 caching application
0e59e9d
@kierenevans
Remove example header
cd63993
@kierenevans
Use underscores
85fe944
@kierenevans
nginx is not the service name in kubernetes
79dbc89
@kierenevans
Render with resourcePrefix'd webapp for helm
e1b4842
@kierenevans
Avoid needing to change all the variations of values file
d2ef796
@kierenevans
Quotes
8c44a6d
@kierenevans
Can't embed .Values in a value already
bfb1863
@kierenevans
Fix for spryker
583a348
@kierenevans
Fix too many restarts
63bb716 
Importing https://varnish-cache.org/docs/6.2/whats-new/upgrading-6.2.html#vcl
from magento/magento2#28137
@kierenevans kierenevans force-pushed the feature/add-varnish-entrypoint branch from 5935b6a to 63bb716 Compare June 18, 2020 07:26
@kierenevans kierenevans merged commit ef92ca8 into 0.8.x Jun 18, 2020
@kierenevans kierenevans deleted the feature/add-varnish-entrypoint branch June 18, 2020 13:00
@kierenevans kierenevans mentioned this pull request Oct 15, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tkotosz tkotosz tkotosz left review comments

@coledave coledave coledave approved these changes

Assignees
No one assigned
Labels
breaking Breaking change, next major release only enhancement New feature or request harness-all Changes required to all harness directories
Projects
None yet
Milestone
0.8.0
Development

Successfully merging this pull request may close these issues.

Add option for varnish container as the entrypoint to the site in Magento 2.x harness
3 participants
@kierenevans @tkotosz @coledave