BC-5546 - Split ingress for Domains (#678)

Separate the Server Ingress to the Server Repo and for each service in own.
With the current version of nginx ingress is it possible to have more igresses with different resources for one domain.

ansible/group_vars/all/x_ingress.yml

@@ -23,10 +23,6 @@ default_ingress:
     path: /login
     serviceName: client-svc
     servicePort: "{{ CLIENT_PORT }}"
-  login_success:
-    path: /login/success
-    serviceName: client-svc
-    servicePort: "{{ CLIENT_PORT }}"
   error:
     path: /error
     serviceName: nuxtclient-svc
@@ -145,114 +141,6 @@ default_ingress:
     path: /api/v1/me
     serviceName: api-svc
     servicePort: "{{ PORT_SERVER }}"
-  api_v3_tasks:
-    path: /api/v3/tasks
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_rooms:
-    path: /api/v3/rooms
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_boards:
-    path: /api/v3/boards
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_columns:
-    path: /api/v3/columns
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_cards:
-    path: /api/v3/cards
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_elements:
-    path: /api/v3/elements
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_submissionItems:
-    path: /api/v3/board-submissions
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_user_me:
-    path: /api/v3/user/me
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_user_import:
-    path: /api/v3/user/import
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_user_language:
-    path: /api/v3/user/language
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_news:
-    path: /api/v3/news
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_dashboard:
-    path: /api/v3/dashboard
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_courses:
-    path: /api/v3/courses
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_lessons:
-    path: /api/v3/lessons
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_school:
-    path: /api/v3/school
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_submissions:
-    path: /api/v3/submissions
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_sharetoken:
-    path: /api/v3/sharetoken
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_sso_login:
-    path: /api/v3/sso/login/
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_sso_oauth:
-    path: /api/v3/sso/oauth/
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_sso_hydra:
-    path: /api/v3/sso/hydra/
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_tools:
-    path: /api/v3/tools
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_user-migration:
-    path: /api/v3/user-migration
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_user-login-migration:
-    path: /api/v3/user-login-migrations
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_system:
-    path: /api/v3/systems/public
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_videoconference2:
-    path: /api/v3/videoconference2
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_groups:
-    path: /api/v3/groups
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
-  api_v3_pseudonyms:
-    path: /api/v3/pseudonyms
-    serviceName: api-svc
-    servicePort: "{{ PORT_SERVER }}"
   api_v1_roster:
     path: /api/v1/roster
   api_roster:
@@ -321,46 +209,6 @@ default_ingress:
     path: /api/v1/config/app/public
     serviceName: api-svc
     servicePort: "{{ PORT_SERVER }}"
-  api_v3_file_upload:
-    path: /api/v3/file/upload
-    serviceName: api-files-svc
-    servicePort: "{{ PORT_FILE_SERVICE }}"
-  api_v3_file_upload_from_url:
-    path: /api/v3/file/upload-from-url
-    serviceName: api-files-svc
-    servicePort: "{{ PORT_FILE_SERVICE }}"
-  api_v3_file_download:
-    path: /api/v3/file/download
-    serviceName: api-files-svc
-    servicePort: "{{ PORT_FILE_SERVICE }}"
-  api_v3_file_list:
-    path: /api/v3/file/list
-    serviceName: api-files-svc
-    servicePort: "{{ PORT_FILE_SERVICE }}"
-  api_v3_file_rename:
-    path: /api/v3/file/rename
-    serviceName: api-files-svc
-    servicePort: "{{ PORT_FILE_SERVICE }}"
-  api_v3_file_delete:
-    path: /api/v3/file/delete
-    serviceName: api-files-svc
-    servicePort: "{{ PORT_FILE_SERVICE }}"
-  api_v3_file_restore:
-    path: /api/v3/file/restore
-    serviceName: api-files-svc
-    servicePort: "{{ PORT_FILE_SERVICE }}"
-  api_v3_file_copy:
-    path: /api/v3/file/copy
-    serviceName: api-files-svc
-    servicePort: "{{ PORT_FILE_SERVICE }}"
-  api_v3_file_preview:
-    path: /api/v3/file/preview
-    serviceName: api-files-svc
-    servicePort: "{{ PORT_FILE_SERVICE }}"
-  api_v3_h5p:
-    path: /api/v3/h5p-editor
-    serviceName: api-h5p-svc
-    with: WITH_H5P_EDITOR
   etherpad:
     path: /etherpad
     serviceName: etherpad-nginx-svc

ansible/group_vars/brb/instance_cfg.yml

@@ -102,10 +102,6 @@ group_ingress:
   api_roster:
     serviceName: api-svc
     servicePort: "{{ PORT_SERVER }}"
-  api_v3_fwu:
-    path: /api/v3/fwu
-    serviceName: api-fwu-svc
-    servicePort: "{{ PORT_FWU_LEARNING_CONTENTS }}"
 
 # BigBlueButton
 VIDEOCONFERENCE_DEFAULT_PRESENTATION: https://s3.hidrive.strato.com/cloud-instances/brb/bbb/presentation.pdf

ansible/host_vars/default_host/x_ingress.yml

@@ -4,5 +4,4 @@ group_ingress:
     path: /h5pstatics
     serviceName: h5p-staticfiles-server-svc
     servicePort: "{{ H5P_PORT }}"
-  api_v3_h5p:
-    servicePort: 4448
+

ansible/roles/ingress/tasks/main.yml

@@ -20,4 +20,5 @@
     kubernetes.core.k8s:
       kubeconfig: ~/.kube/config 
       namespace: "{{ NAMESPACE }}"
-      template: ingress.yml.j2
+      template: ingress.yml.j2
+      apply: yes

ansible/roles/libreoffice/tasks/main.yml

@@ -9,6 +9,7 @@
       kubeconfig: ~/.kube/config 
       namespace: "{{ NAMESPACE }}"
       template: ingress.yml.j2
+      apply: yes
 
   - name: Configmap
     kubernetes.core.k8s:

ansible/roles/libreoffice/templates/ingress.yml.j2

@@ -38,24 +38,10 @@ spec:
             name: libreoffice-svc
             port:
               number: 9980
-      - path: /lool/(.*)/ws
-        pathType: Prefix
-        backend:
-          service:
-            name: libreoffice-svc
-            port:
-              number: 9980
       - path: /lool
         pathType: Prefix
         backend:
           service:
             name: libreoffice-svc
             port:
               number: 9980
-      - path: /lool/adminws
-        pathType: Prefix
-        backend:
-          service:
-            name: libreoffice-svc
-            port:
-              number: 9980