chore: following the istio naming convention for services (#164)

42atomys · Jul 2, 2022 · bf47948 · bf47948
1 parent e66ac66
commit bf47948
Show file tree

Hide file tree

Showing 31 changed files with 87 additions and 51 deletions.
diff --git a/deploy/app/api/base/service.yaml b/deploy/app/api/base/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: api-http
+  name: http-api
 spec:
   ports:
   - port: 4000

diff --git a/deploy/app/api/base/virtual-service.yaml b/deploy/app/api/base/virtual-service.yaml
@@ -1,14 +1,14 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: api-http
+  name: http-api
 spec:
   hosts:
   - s42.app
   gateways:
   - s42-app-live
   http:
-  - name: api-http-gql
+  - name: http-api-gql
     match:
     - method:
         exact: POST
@@ -18,10 +18,10 @@ spec:
       uri: "/graphql"
     route:
     - destination:
-        host: api-http
+        host: http-api
         port:
           number: 4000
-  - name: api-http-gqli
+  - name: http-api-gqli
     match:
     - method:
         exact: GET
@@ -31,6 +31,6 @@ spec:
       uri: "/"
     route:
     - destination:
-        host: api-http
+        host: http-api
         port:
           number: 4000
diff --git a/deploy/app/api/overlays/live/kustomization.yaml b/deploy/app/api/overlays/live/kustomization.yaml
@@ -17,12 +17,12 @@ patchesStrategicMerge:
 replacements:
 - source:
     kind: Service
-    name: api-http
+    name: http-api
     fieldPath: metadata.name
   targets:
   - select:
       kind: VirtualService
-      name: api-http
+      name: http-api
     fieldPaths:
      - spec.http.*.name
      - spec.http.*.route.*.destination.host

diff --git a/deploy/app/api/overlays/live/use-live-routing.yaml b/deploy/app/api/overlays/live/use-live-routing.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: api-http
+  name: http-api
 spec:
   hosts:
   - s42.app

diff --git a/deploy/app/api/overlays/next/kustomization.yaml b/deploy/app/api/overlays/next/kustomization.yaml
@@ -17,12 +17,12 @@ patchesStrategicMerge:
 replacements:
 - source:
     kind: Service
-    name: api-http
+    name: http-api
     fieldPath: metadata.name
   targets:
   - select:
       kind: VirtualService
-      name: api-http
+      name: http-api
     fieldPaths:
      - spec.http.*.name
      - spec.http.*.route.*.destination.host

diff --git a/deploy/app/api/overlays/next/use-next-routing.yaml b/deploy/app/api/overlays/next/use-next-routing.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: api-http
+  name: http-api
 spec:
   hosts:
   - next.s42.app

diff --git a/deploy/app/api/overlays/sandbox/kustomization.yaml b/deploy/app/api/overlays/sandbox/kustomization.yaml
@@ -24,12 +24,12 @@ patches:
 replacements:
 - source:
     kind: Service
-    name: api-http
+    name: http-api
     fieldPath: metadata.name
   targets:
   - select:
       kind: VirtualService
-      name: api-http
+      name: http-api
     fieldPaths:
      - spec.http.*.name
      - spec.http.*.route.*.destination.host

diff --git a/deploy/app/api/overlays/sandbox/use-sandbox-routing.yaml b/deploy/app/api/overlays/sandbox/use-sandbox-routing.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: api-http
+  name: http-api
 spec:
   hosts:
   - sandbox.s42.dev

diff --git a/deploy/app/config/base/configmap.yaml b/deploy/app/config/base/configmap.yaml
@@ -16,7 +16,7 @@ data:
       # a JWT Token
       endpoints:
         sets: https://s42.app/.well-known/jwks
-        sign: prod-jwtks-service-grpc:5000
+        sign: prod-grpc-jwtks-service:5000
       # Certs used to sign and validate the JWT
       # Also called : The JWK
       jwk:

diff --git a/deploy/app/config/overlays/live/use-live.yaml b/deploy/app/config/overlays/live/use-live.yaml
@@ -16,7 +16,7 @@ data:
       # a JWT Token
       endpoints:
         sets: https://s42.app/.well-known/jwks
-        sign: prod-jwtks-service-grpc:5000
+        sign: prod-grpc-jwtks-service:5000
       # Certs used to sign and validate the JWT
       # Also called : The JWK
       jwk:

diff --git a/deploy/app/config/overlays/next/use-next.yaml b/deploy/app/config/overlays/next/use-next.yaml
@@ -16,7 +16,7 @@ data:
       # a JWT Token
       endpoints:
         sets: https://next.s42.app/.well-known/jwks
-        sign: next-jwtks-service-grpc:5000
+        sign: next-grpc-jwtks-service:5000
       # Certs used to sign and validate the JWT
       # Also called : The JWK
       jwk:

diff --git a/deploy/app/config/overlays/sandbox/use-sandbox.yaml b/deploy/app/config/overlays/sandbox/use-sandbox.yaml
@@ -16,15 +16,15 @@ data:
       # a JWT Token
       endpoints:
         sets: https://sandbox.s42.dev/.well-known/jwks
-        sign: sand-jwtks-service-grpc:5000
+        sign: sand-grpc-jwtks-service:5000
       # Certs used to sign and validate the JWT
       # Also called : The JWK
       jwk:
         certPrivateKeyFile: /etc/certs/jwk/private.key
         certPublicKeyFile: /etc/certs/jwk/public.pem
       # Certs used to secure the GRPC Endpoint with SSL/TLS
       grpc:
-        insecure: false
+        insecure: true
         certRootCaFile: /etc/certs/grpc/ca.crt
         certPrivateKeyFile: /etc/certs/grpc/tls.key
         certPublicKeyFile: /etc/certs/grpc/tls.crt

diff --git a/deploy/app/interface/base/service.yaml b/deploy/app/interface/base/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: interface-http
+  name: http-interface
 spec:
   ports:
   - port: 3000

diff --git a/deploy/app/interface/base/virtual-service.yaml b/deploy/app/interface/base/virtual-service.yaml
@@ -1,19 +1,19 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: interface-http
+  name: http-interface
 spec:
   hosts:
   - s42.app
   gateways:
   - s42-app-live
   http:
-  - name: interface-http
+  - name: http-interface
     match:
     - uri:
         prefix: "/"
     route:
     - destination:
-        host: interface-http
+        host: http-interface
         port:
           number: 3000
diff --git a/deploy/app/interface/overlays/live/kustomization.yaml b/deploy/app/interface/overlays/live/kustomization.yaml
@@ -15,12 +15,12 @@ patchesStrategicMerge:
 replacements:
 - source:
     kind: Service
-    name: interface-http
+    name: http-interface
     fieldPath: metadata.name
   targets:
   - select:
       kind: VirtualService
-      name: interface-http
+      name: http-interface
     fieldPaths:
      - spec.http.*.name
      - spec.http.*.route.*.destination.host

diff --git a/deploy/app/interface/overlays/live/use-live-routing.yaml b/deploy/app/interface/overlays/live/use-live-routing.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: interface-http
+  name: http-interface
 spec:
   hosts:
   - s42.app

diff --git a/deploy/app/interface/overlays/next/kustomization.yaml b/deploy/app/interface/overlays/next/kustomization.yaml
@@ -15,12 +15,12 @@ patchesStrategicMerge:
 replacements:
 - source:
     kind: Service
-    name: interface-http
+    name: http-interface
     fieldPath: metadata.name
   targets:
   - select:
       kind: VirtualService
-      name: interface-http
+      name: http-interface
     fieldPaths:
      - spec.http.*.name
      - spec.http.*.route.*.destination.host

diff --git a/deploy/app/interface/overlays/next/use-next-routing.yaml b/deploy/app/interface/overlays/next/use-next-routing.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: interface-http
+  name: http-interface
 spec:
   hosts:
   - next.s42.app

diff --git a/deploy/app/interface/overlays/sandbox/kustomization.yaml b/deploy/app/interface/overlays/sandbox/kustomization.yaml
@@ -23,12 +23,12 @@ patches:
 replacements:
 - source:
     kind: Service
-    name: interface-http
+    name: http-interface
     fieldPath: metadata.name
   targets:
   - select:
       kind: VirtualService
-      name: interface-http
+      name: http-interface
     fieldPaths:
      - spec.http.*.name
      - spec.http.*.route.*.destination.host

diff --git a/deploy/app/interface/overlays/sandbox/use-sandbox-routing.yaml b/deploy/app/interface/overlays/sandbox/use-sandbox-routing.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: interface-http
+  name: http-interface
 spec:
   hosts:
   - sandbox.s42.dev

diff --git a/deploy/app/jwtks-service/base/certificate.yaml b/deploy/app/jwtks-service/base/certificate.yaml
@@ -4,7 +4,7 @@ metadata:
   name: jwtks-service
 spec:
   dnsNames:
-  - jwtks-service-http
+  - http-jwtks-service
   issuerRef:
     kind: ClusterIssuer
     name: selfsigned-issuer

diff --git a/deploy/app/jwtks-service/base/service.yaml b/deploy/app/jwtks-service/base/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: jwtks-service-grpc
+  name: grpc-jwtks-service
 spec:
   ports:
   - port: 5000
@@ -10,7 +10,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: jwtks-service-http
+  name: http-jwtks-service
 spec:
   ports:
   - port: 5500

diff --git a/deploy/app/jwtks-service/base/virtual-service.yaml b/deploy/app/jwtks-service/base/virtual-service.yaml
@@ -1,14 +1,14 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: jwtks-service-http
+  name: http-jwtks-service
 spec:
   hosts:
   - s42.app
   gateways:
   - s42-app-live
   http:
-  - name: jwtks-service-http
+  - name: http-jwtks-service
     match:
     - method:
         exact: GET
@@ -18,6 +18,6 @@ spec:
       uri: "/jwks"
     route:
     - destination:
-        host: jwtks-service-http
+        host: http-jwtks-service
         port:
           number: 5500
diff --git a/deploy/app/jwtks-service/overlays/live/kustomization.yaml b/deploy/app/jwtks-service/overlays/live/kustomization.yaml
@@ -15,7 +15,7 @@ patchesStrategicMerge:
 replacements:
 - source:
     kind: Service
-    name: jwtks-service-grpc
+    name: grpc-jwtks-service
     fieldPath: metadata.name
   targets:
   - select:
@@ -25,12 +25,12 @@ replacements:
     - spec.dnsNames.0
 - source:
     kind: Service
-    name: jwtks-service-http
+    name: http-jwtks-service
     fieldPath: metadata.name
   targets:
   - select:
       kind: VirtualService
-      name: jwtks-service-http
+      name: http-jwtks-service
     fieldPaths:
      - spec.http.*.name
      - spec.http.*.route.*.destination.host

diff --git a/deploy/app/jwtks-service/overlays/live/use-live-routing.yaml b/deploy/app/jwtks-service/overlays/live/use-live-routing.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: jwtks-service-http
+  name: http-jwtks-service
 spec:
   hosts:
   - s42.app

diff --git a/deploy/app/jwtks-service/overlays/next/kustomization.yaml b/deploy/app/jwtks-service/overlays/next/kustomization.yaml
@@ -15,7 +15,7 @@ patchesStrategicMerge:
 replacements:
 - source:
     kind: Service
-    name: jwtks-service-grpc
+    name: grpc-jwtks-service
     fieldPath: metadata.name
   targets:
   - select:
@@ -25,12 +25,12 @@ replacements:
     - spec.dnsNames.0
 - source:
     kind: Service
-    name: jwtks-service-http
+    name: http-jwtks-service
     fieldPath: metadata.name
   targets:
   - select:
       kind: VirtualService
-      name: jwtks-service-http
+      name: http-jwtks-service
     fieldPaths:
      - spec.http.*.name
      - spec.http.*.route.*.destination.host

diff --git a/deploy/app/jwtks-service/overlays/next/use-next-routing.yaml b/deploy/app/jwtks-service/overlays/next/use-next-routing.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: jwtks-service-http
+  name: http-jwtks-service
 spec:
   hosts:
   - next.s42.app