POC: HTTP reverse proxy cache #3610
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| ARG VERSION=7.5.0 | ||
|
|
||
| FROM varnish:${VERSION} | ||
|
|
||
| USER root | ||
|
|
||
| RUN set -e; \ | ||
| apt-get update; \ | ||
| apt-get -y install prometheus-varnish-exporter; | ||
|
|
||
| RUN rm -rf /var/lib/apt/lists/*; | ||
|
|
||
| USER varnish | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../../api/docker/varnish/vcl |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. The varnish deployment setup is mostly copied from https://github.com/softonic/varnish-chart/blob/master/templates/deployment.yaml However, I made some simplifications. And there were some missing things, that prevented me, from directly using their chart. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| {{- if .Values.apiCache.enabled }} | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: {{ include "apiCache.name" . }} | ||
| labels: | ||
| {{- include "apiCache.selectorLabels" . | nindent 4 }} | ||
| {{- include "app.commonLabels" . | nindent 4 }} | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| {{- include "apiCache.selectorLabels" . | nindent 6 }} | ||
| template: | ||
| metadata: | ||
| labels: | ||
| {{- include "apiCache.selectorLabels" . | nindent 8 }} | ||
|
There was a problem hiding this comment. you could add an annotation with the shasum of the confimap. There was a problem hiding this comment. Fixed with 5192278 Probably this line is obsolete, because I also included There was a problem hiding this comment. Maybe you only change the config after some problem and then redeploy with the same image tag. |
||
| annotations: | ||
| checksum/vclConfigmap: {{ include (print $.Template.BasePath "/api_cache_vcl_configmap.yaml") . | sha256sum }} | ||
| rollme: {{ .Values.imageTag | quote }} | ||
| spec: | ||
| {{- with .Values.imagePullSecrets }} | ||
| imagePullSecrets: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| serviceAccountName: {{ include "app.serviceAccountName" . }} | ||
| securityContext: | ||
| {{- toYaml .Values.podSecurityContext | nindent 8 }} | ||
| enableServiceLinks: false | ||
| containers: | ||
| - name: {{ .Chart.Name }}-api-cache-varnishd | ||
| securityContext: | ||
| {{- toYaml .Values.securityContext | nindent 12 }} | ||
| image: "{{ .Values.apiCache.image.repository }}:{{ .Values.apiCache.image.tag | default .Values.imageTag }}" | ||
| imagePullPolicy: {{ .Values.apiCache.image.pullPolicy }} | ||
| ports: | ||
| - name: http | ||
| containerPort: {{ .Values.apiCache.varnishHttpPort }} | ||
| protocol: TCP | ||
| - name: purge | ||
| containerPort: {{ .Values.apiCache.varnishPurgePort }} | ||
| protocol: TCP | ||
| env: | ||
| - name: VARNISH_SIZE | ||
| value: "{{ .Values.apiCache.varnishSize }}" | ||
| - name: VARNISH_HTTP_PORT | ||
| value: "{{ .Values.apiCache.varnishHttpPort }}" | ||
| - name: COOKIE_PREFIX | ||
| value: {{ include "api.cookiePrefix" . | quote }} | ||
| args: | ||
| - -a | ||
| - {{ printf ":%d,HTTP" (.Values.apiCache.varnishPurgePort | int) }} | ||
| - -p | ||
| - http_max_hdr=96 | ||
| resources: | ||
| {{- toYaml .Values.apiCache.resources | nindent 12 }} | ||
| volumeMounts: | ||
| - name: vcl-configmap | ||
| mountPath: /etc/varnish | ||
| - name: vsm | ||
| mountPath: /var/lib/varnish | ||
| {{- if .Values.apiCache.logging.enabled }} | ||
| - name: {{ .Chart.Name }}-api-cache-varnishncsa | ||
| securityContext: | ||
| {{- toYaml .Values.securityContext | nindent 12 }} | ||
| image: "{{ .Values.apiCache.image.repository }}:{{ .Values.apiCache.image.tag | default .Values.imageTag }}" | ||
| imagePullPolicy: {{ .Values.apiCache.image.pullPolicy }} | ||
| command: | ||
| - varnishncsa | ||
| - -b | ||
| - -c | ||
| {{- if .Values.apiCache.logging.customOutputJsonFormat }} | ||
| - -j | ||
| {{- end }} | ||
| {{- if .Values.apiCache.logging.customOutput }} | ||
| - -F | ||
| - {{ .Values.apiCache.logging.customOutput | squote }} | ||
| {{- end }} | ||
| - -t | ||
| - {{ .Values.apiCache.logging.timeout | quote }} | ||
| resources: | ||
| {{- toYaml .Values.apiCache.logging.resources | nindent 12 }} | ||
| volumeMounts: | ||
| - name: vsm | ||
| mountPath: /var/lib/varnish | ||
| {{- end }} | ||
| {{- if .Values.apiCache.prometheus.enabled }} | ||
carlobeltrame marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| - name: {{ .Chart.Name }}-api-cache-prometheus-exporter | ||
| securityContext: | ||
| {{- toYaml .Values.securityContext | nindent 12 }} | ||
| image: "{{ .Values.apiCache.image.repository }}:{{ .Values.apiCache.image.tag | default .Values.imageTag }}" | ||
| imagePullPolicy: {{ .Values.apiCache.image.pullPolicy }} | ||
| ports: | ||
| - name: metrics | ||
| containerPort: {{ .Values.apiCache.prometheus.port }} | ||
| protocol: TCP | ||
| resources: | ||
| {{- toYaml .Values.apiCache.prometheus.resources | nindent 12 }} | ||
| command: | ||
| - prometheus-varnish-exporter | ||
| - -web.telemetry-path | ||
| - "{{ .Values.apiCache.prometheus.path }}" | ||
| - -web.listen-address | ||
| - ":{{ .Values.apiCache.prometheus.port }}" | ||
| volumeMounts: | ||
| - name: vsm | ||
| mountPath: /var/lib/varnish | ||
| {{- end }} | ||
| volumes: | ||
| - name: vcl-configmap | ||
| configMap: | ||
| name: {{ include "apiCache.name" . }}-vcl-configmap | ||
| - name: vsm | ||
| emptyDir: | ||
| medium: Memory | ||
| {{- end }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| {{- if .Values.apiCache.enabled }} | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: {{ include "apiCache.name" . }} | ||
| labels: | ||
| {{- include "apiCache.selectorLabels" . | nindent 4 }} | ||
| {{- include "app.commonLabels" . | nindent 4 }} | ||
| spec: | ||
| type: {{ .Values.apiCache.service.type }} | ||
| ports: | ||
| - port: {{ .Values.apiCache.service.ports.http }} | ||
| targetPort: http | ||
| protocol: TCP | ||
| name: http | ||
| - port: {{ .Values.apiCache.service.ports.purge }} | ||
| targetPort: purge | ||
| protocol: TCP | ||
| name: purge | ||
| - port: {{ .Values.apiCache.prometheus.port }} | ||
| targetPort: metrics | ||
| protocol: TCP | ||
| name: metrics | ||
| selector: | ||
| {{- include "apiCache.selectorLabels" . | nindent 4 }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| {{- if .Values.apiCache.enabled }} | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{ include "apiCache.name" . }}-vcl-configmap | ||
| labels: | ||
| {{- include "apiCache.selectorLabels" . | nindent 4 }} | ||
| {{- include "app.commonLabels" . | nindent 4 }} | ||
| data: | ||
| # includes all files except the ones starting with _ | ||
| {{ (.Files.Glob "files/vcl/[!_]*").AsConfig | indent 2 }} | ||
|
There was a problem hiding this comment. I think this also excludes any hidden files (files starting with a period |
||
| # override backend config | ||
| _config.vcl: |- | ||
| backend default { | ||
| .host = "{{ include "api.name" .}}"; | ||
| .port = "{{ .Values.api.service.port }}"; | ||
| } | ||
| {{- end }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly copied from https://github.com/softonic/varnish/blob/master/Dockerfile
As an alternative, we could also set this up as an independent package outside of this repository (e.g. ecamp/varnish) and regularly build/deploy on docker hub. Both is ok for me.