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

[mtls-proxy] Add annotations option #438

Merged
merged 5 commits into from
Feb 19, 2020
Merged

[mtls-proxy] Add annotations option #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d85ccab
mtls-proxy: Add deployment annotations values option
gracedo Feb 18, 2020
641ffca
mtls-proxy: Bump chart version
gracedo Feb 18, 2020
6823e56
Merge branch 'master' into gracedo/bug_thanos_certs_D2IQ-64099
alejandroEsc Feb 19, 2020
fc4e637
Merge branch 'master' into gracedo/bug_thanos_certs_D2IQ-64099
shaneutt Feb 19, 2020
14d7e69
Merge branch 'master' into gracedo/bug_thanos_certs_D2IQ-64099
alejandroEsc Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/mtls-proxy/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ appVersion: "1.0"
description: mTLS proxy
name: mtls-proxy
home: https://github.com/mesosphere/charts
version: 0.1.0
version: 0.1.1
shaneutt marked this conversation as resolved.
Show resolved Hide resolved
maintainers:
- name: branden
6 changes: 5 additions & 1 deletion stable/mtls-proxy/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ metadata:
name: {{ include "mtls-proxy.fullname" . }}
labels:
{{ include "mtls-proxy.labels" . | indent 4 }}
{{- with .Values.deployment.annotations }}
Copy link
Contributor

Choose a reason for hiding this comment

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

just to double check, can you verify that empty annotation here behaves and deploys as expected.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok tested this, looks great, thank!

annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
Expand Down Expand Up @@ -32,7 +36,7 @@ spec:
- "--key=/etc/certs/tls.key"
- "--cacert=/etc/certs/ca.crt"
# Allow targets outside localhost and unix domain sockets.
- "--unsafe-target"
- "--unsafe-target"
# Don't check cert subject.
- "--allow-all"
ports:
Expand Down
3 changes: 3 additions & 0 deletions stable/mtls-proxy/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,6 @@ target: ""
# Secret containing server and CA certificates.
# Must contain tls.crt, tls.key, and ca.crt.
certSecretName: ""

deployment:
annotations: {}