From 3b984170c08a52556fdc6f264efa89910f976be4 Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Tue, 28 Dec 2021 15:04:08 +0100 Subject: [PATCH 01/31] skr-ingress-refactor --- 01_onsite/01_dev/shubbkoarnsru/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/shubbkoarnsru/deployment.yaml b/01_onsite/01_dev/shubbkoarnsru/deployment.yaml index ebda1d4..9abf2f3 100644 --- a/01_onsite/01_dev/shubbkoarnsru/deployment.yaml +++ b/01_onsite/01_dev/shubbkoarnsru/deployment.yaml @@ -97,7 +97,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: skr-dev-ingress @@ -109,7 +109,10 @@ spec: - host: schubbkoarnsru-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: skr - servicePort: 8000 \ No newline at end of file + - backend: + service: + name: skr + port: + number: 8000 + path: / + pathType: ImplementationSpecific \ No newline at end of file From 998109c64e41164e069e4551221ee53fb0afaeec Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Tue, 28 Dec 2021 15:22:35 +0100 Subject: [PATCH 02/31] refactor trialytix-dev --- 01_onsite/01_dev/trialytix/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/trialytix/deployment.yaml b/01_onsite/01_dev/trialytix/deployment.yaml index 8dfd311..7fe79bb 100644 --- a/01_onsite/01_dev/trialytix/deployment.yaml +++ b/01_onsite/01_dev/trialytix/deployment.yaml @@ -164,7 +164,7 @@ spec: # Ingress description --- -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: trialytix-ingress @@ -176,7 +176,10 @@ spec: - host: trialytix-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: frontend-trialytix-dev - servicePort: 8100 + - backend: + service: + name: frontend-trialytix-dev + port: + number: 8100 + path: / + pathType: ImplementationSpecific From 51a796ff05c39ee681fcbf90fd857340ebb74b26 Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Tue, 28 Dec 2021 15:04:08 +0100 Subject: [PATCH 03/31] skr-ingress-refactor --- 01_onsite/01_dev/shubbkoarnsru/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/shubbkoarnsru/deployment.yaml b/01_onsite/01_dev/shubbkoarnsru/deployment.yaml index ebda1d4..9abf2f3 100644 --- a/01_onsite/01_dev/shubbkoarnsru/deployment.yaml +++ b/01_onsite/01_dev/shubbkoarnsru/deployment.yaml @@ -97,7 +97,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: skr-dev-ingress @@ -109,7 +109,10 @@ spec: - host: schubbkoarnsru-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: skr - servicePort: 8000 \ No newline at end of file + - backend: + service: + name: skr + port: + number: 8000 + path: / + pathType: ImplementationSpecific \ No newline at end of file From 6ca98b105dba45fada7225e740e9efbc3637a753 Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Tue, 28 Dec 2021 15:22:35 +0100 Subject: [PATCH 04/31] refactor trialytix-dev --- 01_onsite/01_dev/trialytix/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/trialytix/deployment.yaml b/01_onsite/01_dev/trialytix/deployment.yaml index 8dfd311..7fe79bb 100644 --- a/01_onsite/01_dev/trialytix/deployment.yaml +++ b/01_onsite/01_dev/trialytix/deployment.yaml @@ -164,7 +164,7 @@ spec: # Ingress description --- -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: trialytix-ingress @@ -176,7 +176,10 @@ spec: - host: trialytix-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: frontend-trialytix-dev - servicePort: 8100 + - backend: + service: + name: frontend-trialytix-dev + port: + number: 8100 + path: / + pathType: ImplementationSpecific From c591a345290c2133e5fe524d4e5daeb8cbb75711 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:04:43 +0100 Subject: [PATCH 05/31] Refactor semcust deployment ingress. --- 01_onsite/01_dev/semcust/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/semcust/deployment.yaml b/01_onsite/01_dev/semcust/deployment.yaml index 017b5ea..1d129f4 100644 --- a/01_onsite/01_dev/semcust/deployment.yaml +++ b/01_onsite/01_dev/semcust/deployment.yaml @@ -253,7 +253,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: semcust-dev-ingress @@ -265,7 +265,10 @@ spec: - host: semcust-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: semcust-frontend-dev - servicePort: 8200 \ No newline at end of file + - backend: + service: + name: semcust-frontend-dev + port: + number: 8200 + path: / + pathType: ImplementationSpecific From 4e93b7a9b06421945ca1620ca867495f95c05faf Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:07:08 +0100 Subject: [PATCH 06/31] Refactor semapp-wagtail ingress. --- 01_onsite/01_dev/semapp-wagtail/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/semapp-wagtail/deployment.yaml b/01_onsite/01_dev/semapp-wagtail/deployment.yaml index 981280d..8d42d34 100644 --- a/01_onsite/01_dev/semapp-wagtail/deployment.yaml +++ b/01_onsite/01_dev/semapp-wagtail/deployment.yaml @@ -97,7 +97,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: semapp-dev-ingress @@ -109,7 +109,10 @@ spec: - host: semapp-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: semapp - servicePort: 8000 \ No newline at end of file + - backend: + service: + name: semapp + port: + number: 8000 + path: / + pathType: ImplementationSpecific From 1270320219e00ae90de2d072785be772228582ba Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:09:25 +0100 Subject: [PATCH 07/31] Refactor rm-dev ingress deployment. --- 01_onsite/01_dev/rm/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/rm/deployment.yaml b/01_onsite/01_dev/rm/deployment.yaml index e311ed9..c459baa 100644 --- a/01_onsite/01_dev/rm/deployment.yaml +++ b/01_onsite/01_dev/rm/deployment.yaml @@ -229,7 +229,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: rm-dev-ingress @@ -241,7 +241,10 @@ spec: - host: rm-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: rm-frontend-srv - servicePort: 80 \ No newline at end of file + - backend: + service: + name: rm-frontend-srv + port: + number: 80 + path: / + pathType: ImplementationSpecific From 554ce7f0cc169ac14e6af6d5294e6eba546dac00 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:11:03 +0100 Subject: [PATCH 08/31] Refactor dev phpmyadmin ingress. --- 01_onsite/01_dev/phpmyadmin/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/phpmyadmin/deployment.yaml b/01_onsite/01_dev/phpmyadmin/deployment.yaml index 0abb0e2..5a4bed8 100644 --- a/01_onsite/01_dev/phpmyadmin/deployment.yaml +++ b/01_onsite/01_dev/phpmyadmin/deployment.yaml @@ -53,7 +53,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: phpmyadmin-dev-ingress @@ -65,7 +65,10 @@ spec: - host: phpmyadmin-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: phpmyadmin - servicePort: 80 \ No newline at end of file + - backend: + service: + name: phpmyadmin + port: + number: 80 + path: / + pathType: ImplementationSpecific \ No newline at end of file From 8b421590df3260fa29349ae8d1f9a44ce5972dca Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:12:22 +0100 Subject: [PATCH 09/31] Refactor dev pgadmin ingress. --- 01_onsite/01_dev/pgadmin/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/pgadmin/deployment.yaml b/01_onsite/01_dev/pgadmin/deployment.yaml index 93ae4bd..8dd98a5 100644 --- a/01_onsite/01_dev/pgadmin/deployment.yaml +++ b/01_onsite/01_dev/pgadmin/deployment.yaml @@ -84,7 +84,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: pgadmin-dev-ingress @@ -96,7 +96,10 @@ spec: - host: pgadmin-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: pgadmin - servicePort: 80 \ No newline at end of file + - backend: + service: + name: pgadmin + port: + number: 80 + path: / + pathType: ImplementationSpecific From 77cbff22cc74500aa9810befcb0a1f85c3298b3d Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:13:14 +0100 Subject: [PATCH 10/31] Refactor passbolt dev ingress. --- 01_onsite/01_dev/passbolt/deployment.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/01_onsite/01_dev/passbolt/deployment.yaml b/01_onsite/01_dev/passbolt/deployment.yaml index 98aa7a2..48e08c8 100644 --- a/01_onsite/01_dev/passbolt/deployment.yaml +++ b/01_onsite/01_dev/passbolt/deployment.yaml @@ -79,7 +79,10 @@ spec: - host: passbolt-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: passbolt - servicePort: 8080 \ No newline at end of file + - backend: + service: + name: passbolt + port: + number: 8080 + path: / + pathType: ImplementationSpecific From 47387b14c7002f40a1ab8de2915bbc8ee19920ad Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:15:34 +0100 Subject: [PATCH 11/31] Remove beta1 passbolt dev ingress. --- 01_onsite/01_dev/passbolt/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/01_onsite/01_dev/passbolt/deployment.yaml b/01_onsite/01_dev/passbolt/deployment.yaml index 48e08c8..bc54136 100644 --- a/01_onsite/01_dev/passbolt/deployment.yaml +++ b/01_onsite/01_dev/passbolt/deployment.yaml @@ -67,7 +67,7 @@ spec: type: NodePort --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: passbolt-dev-ingress From 6917404b17eaf4869e9ac116aa104530b9798352 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:15:56 +0100 Subject: [PATCH 12/31] Refactor gitlab dev ingress. --- 01_onsite/01_dev/gitlab/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/gitlab/deployment.yaml b/01_onsite/01_dev/gitlab/deployment.yaml index 0e83081..ded675f 100644 --- a/01_onsite/01_dev/gitlab/deployment.yaml +++ b/01_onsite/01_dev/gitlab/deployment.yaml @@ -132,7 +132,7 @@ spec: type: NodePort --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: gitlab-dev-ingress @@ -144,7 +144,10 @@ spec: - host: gitlab-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: gitlab-service - servicePort: 80 \ No newline at end of file + - backend: + service: + name: gitlab-service + port: + number: 80 + path: / + pathType: ImplementationSpecific From 9ca1bc87027a10e2d9de6941a977813ece927032 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:16:58 +0100 Subject: [PATCH 13/31] Refactor efc-shop dev ingress. --- 01_onsite/01_dev/efc-shop/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/efc-shop/deployment.yaml b/01_onsite/01_dev/efc-shop/deployment.yaml index d3a9f88..644125f 100644 --- a/01_onsite/01_dev/efc-shop/deployment.yaml +++ b/01_onsite/01_dev/efc-shop/deployment.yaml @@ -141,7 +141,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: efc-shop-dev-ingress @@ -153,7 +153,10 @@ spec: - host: efc-shop-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: efc-shop-frontend-dev - servicePort: 8501 \ No newline at end of file + - backend: + service: + name: efc-shop-frontend-dev + port: + number: 8501 + path: / + pathType: ImplementationSpecific From daef0d4a69dca01948a25d1f932e6a4f622b681e Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:18:06 +0100 Subject: [PATCH 14/31] Refactor EFC dev ingress. --- 01_onsite/01_dev/efc/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/efc/deployment.yaml b/01_onsite/01_dev/efc/deployment.yaml index 3757ee9..19f9e05 100644 --- a/01_onsite/01_dev/efc/deployment.yaml +++ b/01_onsite/01_dev/efc/deployment.yaml @@ -234,7 +234,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: efc-dev-ingress @@ -246,7 +246,10 @@ spec: - host: efc-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: efc-frontend-dev - servicePort: 8500 \ No newline at end of file + - backend: + service: + name: efc-frontend-dev + port: + number: 8500 + path: / + pathType: ImplementationSpecific From 2d73b1b2594edf90accc142be9b5cea0b35241cf Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:19:19 +0100 Subject: [PATCH 15/31] Refactor docker registry ui ingress. --- 01_onsite/01_dev/docker-registry-ui/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/docker-registry-ui/deployment.yaml b/01_onsite/01_dev/docker-registry-ui/deployment.yaml index 6f53b3b..ba4b7c8 100644 --- a/01_onsite/01_dev/docker-registry-ui/deployment.yaml +++ b/01_onsite/01_dev/docker-registry-ui/deployment.yaml @@ -70,7 +70,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: docker-gui-dev-ingress @@ -82,7 +82,10 @@ spec: - host: docker-gui-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: docker-gui - servicePort: 80 \ No newline at end of file + - backend: + service: + name: docker-gui + port: + number: 80 + path: / + pathType: ImplementationSpecific From d3a416b08421ae70e06dffaabc45a4e44f13f548 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:20:14 +0100 Subject: [PATCH 16/31] Refactor basline dev ingress. --- 01_onsite/01_dev/baseline/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/01_dev/baseline/deployment.yaml b/01_onsite/01_dev/baseline/deployment.yaml index f25ee79..07915a5 100644 --- a/01_onsite/01_dev/baseline/deployment.yaml +++ b/01_onsite/01_dev/baseline/deployment.yaml @@ -197,7 +197,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: baseline-dev-ingress @@ -209,7 +209,10 @@ spec: - host: baseline-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: baseline-frontend-dev - servicePort: 8000 \ No newline at end of file + - backend: + service: + name: baseline-frontend-dev + port: + number: 8000 + path: / + pathType: ImplementationSpecific From 77c1bf824cd3240626559f2e7488c31a2f3d84b8 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:27:04 +0100 Subject: [PATCH 17/31] Refactor onsite infra dashboard ingress. --- 01_onsite/00_infra/dashboard/dashboard.ingress.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/00_infra/dashboard/dashboard.ingress.yml b/01_onsite/00_infra/dashboard/dashboard.ingress.yml index 6c9cd37..fb61332 100644 --- a/01_onsite/00_infra/dashboard/dashboard.ingress.yml +++ b/01_onsite/00_infra/dashboard/dashboard.ingress.yml @@ -1,4 +1,4 @@ -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: dashboard-ingress @@ -10,7 +10,10 @@ spec: - host: dashboard.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: kubernetes-dashboard - servicePort: 443 \ No newline at end of file + - backend: + service: + name: kubernetes-dashboard + port: + number: 443 + path: / + pathType: ImplementationSpecific From 67516691a3fc77da70490f4fc003a5ecb585001a Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:28:56 +0100 Subject: [PATCH 18/31] Refactor onsite infra keycloak ingress. --- 01_onsite/00_infra/keycloack/deployment.yaml | 25 +++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/01_onsite/00_infra/keycloack/deployment.yaml b/01_onsite/00_infra/keycloack/deployment.yaml index 0923515..f821f63 100644 --- a/01_onsite/00_infra/keycloack/deployment.yaml +++ b/01_onsite/00_infra/keycloack/deployment.yaml @@ -59,7 +59,7 @@ spec: type: NodePort --- -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: keycloack-ingress @@ -71,17 +71,24 @@ spec: - host: keycloack.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: keycloack-srv - servicePort: 8080 + - backend: + service: + name: keycloack-srv + port: + number: 8080 + path: / + pathType: ImplementationSpecific - host: keycloak.semapp.lan http: paths: - - path: / - backend: - serviceName: keycloack-srv - servicePort: 8080 + - backend: + service: + name: keycloack-srv + port: + number: 8080 + path: / + pathType: ImplementationSpecific + From b5d10c8455d546d1c0dbe9bbf7535d513a1ce8b6 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:31:24 +0100 Subject: [PATCH 19/31] Refactor longhorn ingress infra onsite. --- 01_onsite/00_infra/longhorn/network.yaml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/01_onsite/00_infra/longhorn/network.yaml b/01_onsite/00_infra/longhorn/network.yaml index 7f2c915..a5f7468 100644 --- a/01_onsite/00_infra/longhorn/network.yaml +++ b/01_onsite/00_infra/longhorn/network.yaml @@ -8,7 +8,7 @@ spec: customRequestHeaders: X-Forwarded-Proto: "https" --- -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: longhors-ingress @@ -22,14 +22,20 @@ spec: - host: longhorn.k8s.semapp.lan http: paths: - - path: / - backend: - serviceName: longhorn-frontend - servicePort: 80 + - backend: + service: + name: longhorn-frontend + port: + number: 80 + path: / + pathType: ImplementationSpecific - host: longhorn.k8s.semprod.local http: paths: - - path: / - backend: - serviceName: longhorn-frontend - servicePort: 80 \ No newline at end of file + - backend: + service: + name: longhorn-frontend + port: + number: 80 + path: / + pathType: ImplementationSpecific From 03b344646e1adc28ee04c413b9ae7e9a2db2fa68 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:34:12 +0100 Subject: [PATCH 20/31] Refactor minio console & server ingress onsite infra env. --- 01_onsite/00_infra/minIO/console.yaml | 13 ++++++++----- 01_onsite/00_infra/minIO/server.yaml | 25 ++++++++++++++++--------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/01_onsite/00_infra/minIO/console.yaml b/01_onsite/00_infra/minIO/console.yaml index e327391..66b937f 100644 --- a/01_onsite/00_infra/minIO/console.yaml +++ b/01_onsite/00_infra/minIO/console.yaml @@ -57,7 +57,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: minio-console-dev-ingress @@ -69,7 +69,10 @@ spec: - host: minio-console-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: minio-console - servicePort: 9090 \ No newline at end of file + - backend: + service: + name: minio-console + port: + number: 9090 + path: / + pathType: ImplementationSpecific diff --git a/01_onsite/00_infra/minIO/server.yaml b/01_onsite/00_infra/minIO/server.yaml index b08bfab..af992fe 100644 --- a/01_onsite/00_infra/minIO/server.yaml +++ b/01_onsite/00_infra/minIO/server.yaml @@ -77,7 +77,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: minio-dev-ingress @@ -89,14 +89,21 @@ spec: - host: minio-api-dev.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: minio-api - servicePort: 9000 + - backend: + service: + name: minio-api + port: + number: 9000 + path: / + pathType: ImplementationSpecific + - host: minio-api-dev.semapp.lan http: paths: - - path: / - backend: - serviceName: minio-api - servicePort: 9000 \ No newline at end of file + - backend: + service: + name: minio-api + port: + number: 9000 + path: / + pathType: ImplementationSpecific From 301753bf1e989dde4fc872c099ca9d163b3812f2 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:35:29 +0100 Subject: [PATCH 21/31] Refactor onsite infra passbolt ingress. --- 01_onsite/00_infra/passbolt/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/00_infra/passbolt/deployment.yaml b/01_onsite/00_infra/passbolt/deployment.yaml index 03cd8b6..2ff660d 100644 --- a/01_onsite/00_infra/passbolt/deployment.yaml +++ b/01_onsite/00_infra/passbolt/deployment.yaml @@ -75,7 +75,7 @@ spec: type: NodePort --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: passbolt-infra-ingress @@ -87,7 +87,10 @@ spec: - host: passbolt.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: passbolt - servicePort: 8080 \ No newline at end of file + - backend: + service: + name: passbolt + port: + number: 8080 + path: / + pathType: ImplementationSpecific From 81317470673f00ea228c9e223d8246f7e8ef6e4d Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:36:50 +0100 Subject: [PATCH 22/31] Refactor onsite infra phpmyadmin ingress. --- 01_onsite/00_infra/phpmyadmin/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/00_infra/phpmyadmin/deployment.yaml b/01_onsite/00_infra/phpmyadmin/deployment.yaml index 1d09b5e..5da6019 100644 --- a/01_onsite/00_infra/phpmyadmin/deployment.yaml +++ b/01_onsite/00_infra/phpmyadmin/deployment.yaml @@ -53,7 +53,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: phpmyadmin-infra-ingress @@ -65,7 +65,10 @@ spec: - host: phpmyadmin.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: phpmyadmin - servicePort: 80 \ No newline at end of file + - backend: + service: + name: phpmyadmin + port: + number: 80 + path: / + pathType: ImplementationSpecific From 15e488a59bb6faf2ed9c8b452f52f04dc3f62a93 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:39:39 +0100 Subject: [PATCH 23/31] Refactor infra onsite texservice ingress. --- 01_onsite/00_infra/texservice/deployment.yaml | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/01_onsite/00_infra/texservice/deployment.yaml b/01_onsite/00_infra/texservice/deployment.yaml index c36d56f..e270976 100644 --- a/01_onsite/00_infra/texservice/deployment.yaml +++ b/01_onsite/00_infra/texservice/deployment.yaml @@ -50,7 +50,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: texservice-ingress @@ -62,15 +62,21 @@ spec: - host: texservice.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: texservice - servicePort: 5010 - rules: + - backend: + service: + name: texservice + port: + number: 5010 + path: / + pathType: ImplementationSpecific + - host: texservice.semapp.lan http: paths: - - path: / - backend: - serviceName: texservice - servicePort: 5010 \ No newline at end of file + - backend: + service: + name: texservice + port: + number: 5010 + path: / + pathType: ImplementationSpecific From dd98ec8b1727a959235ef5ecab631128c396fd03 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:42:49 +0100 Subject: [PATCH 24/31] Refactor onsite qa baseline ingress. --- 01_onsite/02_qa/baseline/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/02_qa/baseline/deployment.yaml b/01_onsite/02_qa/baseline/deployment.yaml index cc57d5e..a9d25b3 100644 --- a/01_onsite/02_qa/baseline/deployment.yaml +++ b/01_onsite/02_qa/baseline/deployment.yaml @@ -194,7 +194,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: baseline-qa-ingress @@ -206,7 +206,10 @@ spec: - host: baseline-qa.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: baseline-frontend-qa - servicePort: 8000 \ No newline at end of file + - backend: + service: + name: baseline-frontend-qa + port: + number: 8000 + path: / + pathType: ImplementationSpecific From 195fae044acabc96b1542b28b7fa560a59168e4f Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:43:54 +0100 Subject: [PATCH 25/31] Refactor onsite qa efc ingress. --- 01_onsite/02_qa/efc/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/02_qa/efc/deployment.yaml b/01_onsite/02_qa/efc/deployment.yaml index 6ce69a2..e800baa 100644 --- a/01_onsite/02_qa/efc/deployment.yaml +++ b/01_onsite/02_qa/efc/deployment.yaml @@ -234,7 +234,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: efc-qa-ingress @@ -246,7 +246,10 @@ spec: - host: efc-qa.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: efc-frontend-qa - servicePort: 8500 \ No newline at end of file + - backend: + service: + name: efc-frontend-qa + port: + number: 8500 + path: / + pathType: ImplementationSpecific From 032d8a7ad0faadd3b81ed61706995e08874679e6 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:44:53 +0100 Subject: [PATCH 26/31] Refactor onsite qa efc.shop ingress. --- 01_onsite/02_qa/efc-shop/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/02_qa/efc-shop/deployment.yaml b/01_onsite/02_qa/efc-shop/deployment.yaml index 333a53a..d8473d4 100644 --- a/01_onsite/02_qa/efc-shop/deployment.yaml +++ b/01_onsite/02_qa/efc-shop/deployment.yaml @@ -137,7 +137,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: efc-shop-qa-ingress @@ -149,7 +149,10 @@ spec: - host: efc-shop-qa.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: efc-shop-frontend-qa - servicePort: 8501 \ No newline at end of file + - backend: + service: + name: efc-shop-frontend-qa + port: + number: 8501 + path: / + pathType: ImplementationSpecific From 93c0ae70106a99c639562ce8dcdce10dc1038d3f Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:46:00 +0100 Subject: [PATCH 27/31] Refactor onsite qa rm ingress. --- 01_onsite/02_qa/rm/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/02_qa/rm/deployment.yaml b/01_onsite/02_qa/rm/deployment.yaml index 4a5546c..aaaee82 100644 --- a/01_onsite/02_qa/rm/deployment.yaml +++ b/01_onsite/02_qa/rm/deployment.yaml @@ -231,7 +231,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: rm-qa-ingress @@ -243,7 +243,10 @@ spec: - host: rm-qa.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: rm-frontend-srv - servicePort: 80 \ No newline at end of file + - backend: + service: + name: rm-frontend-srv + port: + number: 80 + path: / + pathType: ImplementationSpecific From 0675577acc11bd7806922c5ea5b5daf107ea9b2f Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:46:53 +0100 Subject: [PATCH 28/31] Refactor onsite qa semcust ingress. --- 01_onsite/02_qa/semcust/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/02_qa/semcust/deployment.yaml b/01_onsite/02_qa/semcust/deployment.yaml index cc2fb61..55a68f1 100644 --- a/01_onsite/02_qa/semcust/deployment.yaml +++ b/01_onsite/02_qa/semcust/deployment.yaml @@ -252,7 +252,7 @@ spec: --- # Ingress description -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: semcust-qa-ingress @@ -264,7 +264,10 @@ spec: - host: semcust-qa.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: semcust-frontend-qa - servicePort: 8200 \ No newline at end of file + - backend: + service: + name: semcust-frontend-qa + port: + number: 8200 + path: / + pathType: ImplementationSpecific From 0833188253eacaa0303e42cb244c604806cbbd8c Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 29 Dec 2021 17:48:10 +0100 Subject: [PATCH 29/31] Refactor onsite qa trialytix ingress. --- 01_onsite/02_qa/trialytix/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/01_onsite/02_qa/trialytix/deployment.yaml b/01_onsite/02_qa/trialytix/deployment.yaml index 41c60c8..db51ee4 100644 --- a/01_onsite/02_qa/trialytix/deployment.yaml +++ b/01_onsite/02_qa/trialytix/deployment.yaml @@ -166,7 +166,7 @@ spec: # Ingress description --- -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: trialytix-qa-ingress @@ -178,7 +178,10 @@ spec: - host: trialytix-qa.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: frontend-trialytix-qa - servicePort: 8100 + - backend: + service: + name: frontend-trialytix-qa + port: + number: 8100 + path: / + pathType: ImplementationSpecific From 1c1fefa3662b55ebbcddf806db1675f645cc9c4a Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Tue, 18 Jan 2022 15:50:34 +0100 Subject: [PATCH 30/31] keyclock onsite ingress refactor --- 01_onsite/00_infra/keycloack/deployment.yaml | 24 ++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/01_onsite/00_infra/keycloack/deployment.yaml b/01_onsite/00_infra/keycloack/deployment.yaml index 0923515..8c3c30d 100644 --- a/01_onsite/00_infra/keycloack/deployment.yaml +++ b/01_onsite/00_infra/keycloack/deployment.yaml @@ -59,7 +59,7 @@ spec: type: NodePort --- -apiVersion: networking.k8s.io/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: keycloack-ingress @@ -71,17 +71,23 @@ spec: - host: keycloack.k3s.semapp.lan http: paths: - - path: / - backend: - serviceName: keycloack-srv - servicePort: 8080 + - backend: + service: + name: keycloack-srv + port: + number: 8080 + path: / + pathType: ImplementationSpecific - host: keycloak.semapp.lan http: paths: - - path: / - backend: - serviceName: keycloack-srv - servicePort: 8080 + - backend: + service: + name: keycloack-srv + port: + number: 8080 + path: / + pathType: ImplementationSpecific From d0830f53bf65e35d6e5cbd8938ee58cbfbbb19cf Mon Sep 17 00:00:00 2001 From: Domagoj Zecevic Date: Tue, 18 Jan 2022 15:56:08 +0100 Subject: [PATCH 31/31] longhorn ingress v1 fix --- 01_onsite/00_infra/longhorn/network.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/01_onsite/00_infra/longhorn/network.yaml b/01_onsite/00_infra/longhorn/network.yaml index a5f7468..769b39e 100644 --- a/01_onsite/00_infra/longhorn/network.yaml +++ b/01_onsite/00_infra/longhorn/network.yaml @@ -19,17 +19,7 @@ metadata: traefik.ingress.kubernetes.io/router.middlewares: longhorn-system-svc-longhorn-headers@kubernetescrd spec: rules: - - host: longhorn.k8s.semapp.lan - http: - paths: - - backend: - service: - name: longhorn-frontend - port: - number: 80 - path: / - pathType: ImplementationSpecific - - host: longhorn.k8s.semprod.local + - host: longhorn.k3s.semapp.lan http: paths: - backend: