From ed4cbe294811aa957bd2b1a5e393d9769d4357e5 Mon Sep 17 00:00:00 2001
From: Pete Birley <petebirley@gmail.com>
Date: Fri, 19 Mar 2021 16:36:22 +0000
Subject: [PATCH] Revert "Dex Charts - Airship 2 Integration"

This reverts commit ed49ac5aac8203853276a931d9d88dd95e9e6c76.

Reason for revert: not required

Change-Id: Ic6e0bf006c0788095a5bc919486fc64afb89731c
---
 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, 5 insertions(+), 16 deletions(-)
 delete 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 115790ec..4cc7ca89 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: {{ .Values.params.service.type }}
+  type: NodePort
   ports:
   - name: http
-    targetPort: 80
+    targetPort: http
     port: {{ .Values.params.endpoints.port.http }}
-    nodePort: {{ .Values.params.endpoints.nodePort.http }}
+    nodePort: {{ .Values.params.endpoints.port.http }}
     protocol: TCP
   - name: https
-    targetPort: 443
+    targetPort: https
     port: {{ .Values.params.endpoints.port.https }}
-    nodePort: {{ .Values.params.endpoints.nodePort.https }}
+    nodePort: {{ .Values.params.endpoints.port.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 e678244e..79dfc2cc 100644
--- a/charts/dex-aio/values.yaml
+++ b/charts/dex-aio/values.yaml
@@ -32,17 +32,12 @@ 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
deleted file mode 100644
index 70cc010b..00000000
--- a/charts/dex-aio/values_overrides/default.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-params:
-    tls:
-      cert_manager: true
-      issuer:
-        name: dex-ca-issuer
-        kind: ClusterIssuer