moved radicale to c.aggtaa.com/server2 and davical to c.aggtaa.com/server

clusters/base/apps/davical/helmrelease-davical.yaml

@@ -34,7 +34,7 @@ spec:
               tag: "82-1.1.12"
             env:
               TZ: Europe/Moscow
-              HOST_NAME: c2.aggtaa.com
+              HOST_NAME: c.aggtaa.com
               DBHOST: davical-postgres
               UPDATE_FROM_OLD: "false"
               PGSQL_ROOT_PASS:
@@ -74,20 +74,24 @@ spec:
     ingress:
       app:
         className: traefik
+        # no cert-manager annotation here: radicale's own Ingress already
+        # requests/owns the Certificate for c.aggtaa.com -> radicale-tls.
+        # A second Ingress with the annotation would create a competing
+        # Certificate for the same host/secret.
         annotations:
-          cert-manager.io/cluster-issuer: letsencrypt-prod
+          traefik.ingress.kubernetes.io/router.middlewares: pim-davical-stripprefix@kubernetescrd
         hosts:
-          - host: c2.aggtaa.com
+          - host: c.aggtaa.com
             paths:
-              - path: /
+              - path: /server
                 pathType: Prefix
                 service:
                   identifier: app
                   port: http
         tls:
-          - secretName: davical-tls
+          - secretName: radicale-tls
             hosts:
-              - c2.aggtaa.com
+              - c.aggtaa.com
 
     persistence:
       config:

clusters/base/apps/davical/kustomization.yaml

@@ -3,5 +3,6 @@ kind: Kustomization
 resources:
   - helmrepository.yaml
   - secret.enc.yaml
+  - middleware.yaml
   - helmrelease-postgres.yaml
   - helmrelease-davical.yaml

clusters/base/apps/davical/middleware.yaml

@@ -0,0 +1,9 @@
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: davical-stripprefix
+  namespace: pim
+spec:
+  stripPrefix:
+    prefixes:
+      - /server

clusters/base/apps/radicale/helmrelease-agendav.yaml

@@ -23,7 +23,7 @@ spec:
               AGENDAV_TITLE: ""
               AGENDAV_FOOTER: ""
               AGENDAV_CALDAV_SERVER: "http://radicale.pim.svc.cluster.local:5232/%u"
-              AGENDAV_CALDAV_PUBLIC_URL: "https://c.aggtaa.com/server"
+              AGENDAV_CALDAV_PUBLIC_URL: "https://c.aggtaa.com/server2"
               AGENDAV_TIMEZONE: "Europe/Moscow"
               AGENDAV_WEEKSTART: "1"
               AGENDAV_LANG: "en"

clusters/base/apps/radicale/helmrelease-radicale.yaml

@@ -40,7 +40,7 @@ spec:
         hosts:
           - host: c.aggtaa.com
             paths:
-              - path: /server
+              - path: /server2
                 pathType: Prefix
                 service:
                   identifier: app

clusters/base/apps/radicale/middleware.yaml

@@ -8,7 +8,7 @@ metadata:
 spec:
   stripPrefix:
     prefixes:
-      - /server
+      - /server2
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
@@ -18,4 +18,4 @@ metadata:
 spec:
   headers:
     customRequestHeaders:
-      X-Script-Name: /server
+      X-Script-Name: /server2