From ed49ac5aac8203853276a931d9d88dd95e9e6c76 Mon Sep 17 00:00:00 2001
From: Sidney Shiba <sidney.shiba@ericsson.com>
Date: Thu, 11 Feb 2021 14:26:18 -0600
Subject: [PATCH] Dex Charts - Airship 2 Integration

This patchset supports Dex Helm charts to be used for deploying Dex on a
CAPI Target cluster.

Change-Id: Ic318788f0a2e2a3e5ca33a39e1adfbddcda8f5c4
---
 charts/dex-aio/templates/Service-dex.yaml    | 10 +++++-----
 charts/dex-aio/values.yaml                   |  5 +++++
 charts/dex-aio/values_overrides/default.yaml |  6 ++++++
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 charts/dex-aio/values_overrides/default.yaml

diff --git a/charts/dex-aio/templates/Service-dex.yaml b/charts/dex-aio/templates/Service-dex.yaml
index 4cc7ca89..115790ec 100644
--- a/charts/dex-aio/templates/Service-dex.yaml
+++ b/charts/dex-aio/templates/Service-dex.yaml
@@ -6,17 +6,17 @@ metadata:
   name: {{ template "helpers.labels.fullname" . }}
   labels: {{- include "helpers.labels.labels" . | nindent 4 }}
 spec:
-  type: NodePort
+  type: {{ .Values.params.service.type }}
   ports:
   - name: http
-    targetPort: http
+    targetPort: 80
     port: {{ .Values.params.endpoints.port.http }}
-    nodePort: {{ .Values.params.endpoints.port.http }}
+    nodePort: {{ .Values.params.endpoints.nodePort.http }}
     protocol: TCP
   - name: https
-    targetPort: https
+    targetPort: 443
     port: {{ .Values.params.endpoints.port.https }}
-    nodePort: {{ .Values.params.endpoints.port.https }}
+    nodePort: {{ .Values.params.endpoints.nodePort.https }}
     protocol: TCP
   selector: {{- include "helpers.labels.matchLabels" . | nindent 4 }}
 ...
diff --git a/charts/dex-aio/values.yaml b/charts/dex-aio/values.yaml
index 79dfc2cc..e678244e 100644
--- a/charts/dex-aio/values.yaml
+++ b/charts/dex-aio/values.yaml
@@ -32,12 +32,17 @@ node_labels:
 params:
   site:
     name: PDL1
+  service:
+    type: NodePort
   endpoints:
     hostname: vm-capi-docker.lan
     port:
       https: 5556
       http: 5554
       k8s: 6443
+    nodePort:
+      https: 30556
+      http: 30554
     tls:
       cert_manager: false
       issuer:
diff --git a/charts/dex-aio/values_overrides/default.yaml b/charts/dex-aio/values_overrides/default.yaml
new file mode 100644
index 00000000..70cc010b
--- /dev/null
+++ b/charts/dex-aio/values_overrides/default.yaml
@@ -0,0 +1,6 @@
+params:
+    tls:
+      cert_manager: true
+      issuer:
+        name: dex-ca-issuer
+        kind: ClusterIssuer