Merge "Revert "Dex Charts - Airship 2 Integration""

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 }}
 ...

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:

charts/dex-aio/values_overrides/default.yaml

@@ -1,6 +0,0 @@
-params:
-    tls:
-      cert_manager: true
-      issuer:
-        name: dex-ca-issuer
-        kind: ClusterIssuer