Merge branch 'refactor/01_onsite-ingress-networking.k8s.io/v1' into 'master'

refactor/01_onsite-ingress-networking.k8s.io/v1 See merge request devops/k8s-deployments!50
4 years ago · 8715277c3c
27 changed files with 240 additions and 156 deletions
--- 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
+      - backend:
+          service:
+            name: kubernetes-dashboard
+            port:
+              number: 443
+        path: /
+        pathType: ImplementationSpecific
--- 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

                

--- 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
@ -19,17 +19,13 @@ metadata:
    traefik.ingress.kubernetes.io/router.middlewares: longhorn-system-svc-longhorn-headers@kubernetescrd
 spec:
  rules:
-  - host: longhorn.k8s.semapp.lan
+  - host: longhorn.k3s.semapp.lan
    http:
      paths:
-      - path: /
-        backend:
-          serviceName: longhorn-frontend
-          servicePort: 80
-  - host: longhorn.k8s.semprod.local
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: longhorn-frontend
-          servicePort: 80
+      - backend:
+          service:
+            name: longhorn-frontend
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: minio-console
+            port:
+              number: 9090
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: minio-api
+            port:
+              number: 9000
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: passbolt
+            port:
+              number: 8080
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: phpmyadmin
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: texservice
+            port:
+              number: 5010
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: baseline-frontend-dev
+            port:
+              number: 8000
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: docker-gui
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: efc-shop-frontend-dev
+            port:
+              number: 8501
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: efc-frontend-dev
+            port:
+              number: 8500
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: gitlab-service
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific
--- 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
@ -79,7 +79,10 @@ spec:
  - host: passbolt-dev.k3s.semapp.lan
    http:
      paths:
-      - path: /
-        backend:
-          serviceName: passbolt
-          servicePort: 8080
+      - backend:
+          service:
+            name: passbolt
+            port:
+              number: 8080
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: pgadmin
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: phpmyadmin
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific
--- a/01_onsite/01_dev/rm/deployment.yaml
+++ b/01_onsite/01_dev/rm/deployment.yaml
@ -230,7 +230,7 @@ spec:
 ---

 # Ingress description
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: rm-dev-ingress
@ -242,7 +242,10 @@ spec:
  - host: rm-dev.k3s.semapp.lan
    http:
      paths:
-      - path: /
-        backend:
-          serviceName: rm-frontend-srv
-          servicePort: 80
+      - backend:
+          service:
+            name: rm-frontend-srv
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: semapp
+            port:
+              number: 8000
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: semcust-frontend-dev
+            port:
+              number: 8200
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: skr
+            port:
+              number: 8000
+        path: /
+        pathType: ImplementationSpecific
--- 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
--- 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
+      - backend:
+          service:
+            name: baseline-frontend-qa
+            port:
+              number: 8000
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: efc-shop-frontend-qa
+            port:
+              number: 8501
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: efc-frontend-qa
+            port:
+              number: 8500
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: rm-frontend-srv
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific
--- 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
+      - backend:
+          service:
+            name: semcust-frontend-qa
+            port:
+              number: 8200
+        path: /
+        pathType: ImplementationSpecific
--- 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