Rename the lldap service

2 files changed, 17 insertions, 14 deletions

diff --git a/data.d/k3s-master/manifests.d/mieshu/personal-services/lldap/ingress.yaml b/data.d/k3s-master/manifests.d/mieshu/personal-services/lldap/ingress.yaml
index 5d2317a..35180f9 100644
--- a/data.d/k3s-master/manifests.d/mieshu/personal-services/lldap/ingress.yaml
+++ b/data.d/k3s-master/manifests.d/mieshu/personal-services/lldap/ingress.yaml
@@ -19,7 +19,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: lldap-http
+            name: lldap-http-service
             port:
               number: 17170
 ...
diff --git a/data.d/k3s-master/manifests.d/mieshu/personal-services/lldap/service.yaml b/data.d/k3s-master/manifests.d/mieshu/personal-services/lldap/service.yaml
index aeb941c..374a154 100644
--- a/data.d/k3s-master/manifests.d/mieshu/personal-services/lldap/service.yaml
+++ b/data.d/k3s-master/manifests.d/mieshu/personal-services/lldap/service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: lldap-http
+  name: lldap-http-service
   namespace: personal-services
   labels:
     app.kubernetes.io/created-by: tyil
@@ -16,15 +16,18 @@ spec:
     app.kubernetes.io/name: lldap
     app.kubernetes.io/part-of: personal-services
   ports:
-    - name: http
-      port: 17170
-      targetPort: 17170
+  - name: http
+    port: 17170
+    targetPort: 17170
 ...
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: lldap-ldap
+  # This port may _not_ be named "lldap_ldap", as the application itself wants
+  # to use LLDAP_LDAP_PORT, which Kubernetes will override with a value the
+  # application can't handle.
+  name: lldap-ldap-service
   namespace: personal-services
   labels:
     app.kubernetes.io/created-by: tyil
@@ -39,12 +42,12 @@ spec:
     app.kubernetes.io/part-of: personal-services
   type: NodePort
   ports:
-    - name: ldap
-      port: 3890
-      targetPort: 3890
-      nodePort: 3890
-    - name: ldaps
-      port: 6360
-      targetPort: 6360
-      nodePort: 6360
+  - name: ldap
+    port: 3890
+    targetPort: 3890
+    nodePort: 3890
+  - name: ldaps
+    port: 6360
+    targetPort: 6360
+    nodePort: 6360
 ...