From 5810c19aea4dcee1b73b1334e6eb71acba4e02c7 Mon Sep 17 00:00:00 2001
From: Tin Lam <tin@irrational.io>
Date: Mon, 9 Jul 2018 11:42:58 -0500
Subject: [PATCH] feat(tls): add tls support for Armada

Adds TLS support for Armada API.

Change-Id: Iaa08c9122d3722cd658a62599b40511b87b29182
External-tracking: #370977
Signed-off-by: Tin Lam <tin@irrational.io>
---
 charts/armada/templates/secret-ingress-tls.yaml | 17 +++++++++++++++++
 charts/armada/values.yaml                       | 12 ++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 charts/armada/templates/secret-ingress-tls.yaml

diff --git a/charts/armada/templates/secret-ingress-tls.yaml b/charts/armada/templates/secret-ingress-tls.yaml
new file mode 100644
index 00000000..874500e9
--- /dev/null
+++ b/charts/armada/templates/secret-ingress-tls.yaml
@@ -0,0 +1,17 @@
+{{/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+
+{{- if .Values.manifests.secret_ingress_tls }}
+{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "armada" ) }}
+{{- end }}
diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml
index eefaa54f..b928d366 100644
--- a/charts/armada/values.yaml
+++ b/charts/armada/values.yaml
@@ -138,6 +138,13 @@ endpoints:
       default: http
     host_fqdn_override:
       default: null
+      # NOTE(lamt): This chart supports TLS for fqdn overriden public
+      # endpoints using the following format:
+      # public:
+      #   host: null
+      #   tls:
+      #     crt: null
+      #     key: null
   local_image_registry:
     name: docker-registry
     namespace: docker-registry
@@ -155,6 +162,10 @@ secrets:
   identity:
     admin: armada-keystone-admin
     armada: armada-keystone-user
+  tls:
+    armada:
+      api:
+        public: armada-tls-public
 
 conf:
   armada:
@@ -287,6 +298,7 @@ manifests:
   job_ks_endpoints: true
   job_ks_service: true
   job_ks_user: true
+  secret_ingress_tls: true
   secret_keystone: true
   service: true
   service_ingress: true