From 9a294848e39c2359078399d665c8f006d7503116 Mon Sep 17 00:00:00 2001 From: Grace Do Date: Wed, 19 Feb 2020 10:00:27 -0800 Subject: [PATCH] [mtls-proxy] Add annotations option (#438) * mtls-proxy: Add deployment annotations values option * mtls-proxy: Bump chart version Co-authored-by: Alejandro Escobar Co-authored-by: Shane Utt --- stable/mtls-proxy/Chart.yaml | 2 +- stable/mtls-proxy/templates/deployment.yaml | 6 +++++- stable/mtls-proxy/values.yaml | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/stable/mtls-proxy/Chart.yaml b/stable/mtls-proxy/Chart.yaml index f62966877..c25c1c4c8 100644 --- a/stable/mtls-proxy/Chart.yaml +++ b/stable/mtls-proxy/Chart.yaml @@ -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 maintainers: - name: branden diff --git a/stable/mtls-proxy/templates/deployment.yaml b/stable/mtls-proxy/templates/deployment.yaml index 9ec48a79c..b75417123 100644 --- a/stable/mtls-proxy/templates/deployment.yaml +++ b/stable/mtls-proxy/templates/deployment.yaml @@ -4,6 +4,10 @@ metadata: name: {{ include "mtls-proxy.fullname" . }} labels: {{ include "mtls-proxy.labels" . | indent 4 }} +{{- with .Values.deployment.annotations }} + annotations: + {{- toYaml . | nindent 4 }} +{{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -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: diff --git a/stable/mtls-proxy/values.yaml b/stable/mtls-proxy/values.yaml index cb0c34051..24b922874 100644 --- a/stable/mtls-proxy/values.yaml +++ b/stable/mtls-proxy/values.yaml @@ -47,3 +47,6 @@ target: "" # Secret containing server and CA certificates. # Must contain tls.crt, tls.key, and ca.crt. certSecretName: "" + +deployment: + annotations: {}