From 407396a66650cae1113e33c18d1b4d943f9dc92a Mon Sep 17 00:00:00 2001
From: Evgeny L <el247k@att.com>
Date: Mon, 10 Dec 2018 16:20:33 +0000
Subject: [PATCH] Add proxy override for Armada chart

Armada service may require the access to external repositories,
add proxy configuration to be able to install it behind the proxy.

Change-Id: I30f6ce6256e234b33f5fbce80387290d2cdb40c1
---
 .../software/charts/ucp/armada/armada.yaml    |  2 +
 .../software/charts/ucp/armada/armada.yaml    | 44 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml

diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml
index dce9d5a7..07243ebe 100644
--- a/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml
+++ b/deployment_files/global/v1.0dev/software/charts/ucp/armada/armada.yaml
@@ -6,6 +6,8 @@ metadata:
   layeringDefinition:
     abstract: false
     layer: global
+  labels:
+    name: ucp-armada
   storagePolicy: cleartext
   substitutions:
     # Chart source
diff --git a/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml b/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml
new file mode 100644
index 00000000..26eeac2f
--- /dev/null
+++ b/deployment_files/type/single-node-proxy/v1.0dev/software/charts/ucp/armada/armada.yaml
@@ -0,0 +1,44 @@
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-armada
+  replacement: true
+  layeringDefinition:
+    abstract: false
+    layer: type
+    parentSelector:
+      name: ucp-armada
+    actions:
+      - method: merge
+        path: .
+  storagePolicy: cleartext
+  substitutions:
+    # HTTP Proxy env
+    - src:
+        schema: pegleg/CommonAddresses/v1
+        name: common-addresses
+        path: .proxy.http
+      dest:
+        path: .values.pod.env.armada_api[0].value
+    - src:
+        schema: pegleg/CommonAddresses/v1
+        name: common-addresses
+        path: .proxy.https
+      dest:
+        path: .values.pod.env.armada_api[1].value
+    - src:
+        schema: pegleg/CommonAddresses/v1
+        name: common-addresses
+        path: .proxy.no_proxy
+      dest:
+        path: .values.pod.env.armada_api[2].value
+data:
+  values:
+    pod:
+      env:
+        armada_api:
+          - name: http_proxy
+          - name: https_proxy
+          - name: no_proxy
+...