Parcourir la source

fix: separate services instead of nginx ingress

Fela Maslen il y a 5 ans
Parent
commit
e62f0c4488
2 fichiers modifiés avec 18 ajouts et 28 suppressions
  1. 1 1
      gmus-web/Dockerfile
  2. 17 27
      k8s/manifest.yml

+ 1 - 1
gmus-web/Dockerfile

@@ -3,7 +3,7 @@ FROM docker.fela.space/gmus-web-builder:latest
 FROM nginx:alpine
 
 RUN mkdir /app
-RUN chown -R nginx:nginx /app /var/cache/nginx && touch /var/run/nginx.pid && chown nginx:nginx /var/run/nginx.pid
+RUN touch /var/run/nginx.pid && chown -R nginx:nginx /app /var/cache/nginx /var/run/nginx.pid
 USER nginx
 WORKDIR /app
 

+ 17 - 27
k8s/manifest.yml

@@ -1,40 +1,30 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: gmus
+  name: gmus-backend
 spec:
   type: LoadBalancer
   selector:
-    app: gmus
+    app: gmus-backend
   ports:
     - name: http
       protocol: TCP
-      port: 8081
+      port: 8080
       targetPort: 8080
 ---
-apiVersion: networking.k8s.io/v1
-kind: Ingress
+apiVersion: v1
+kind: Service
 metadata:
-  name: gmus-ingress
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
+  name: gmus-web
 spec:
-  rules:
-    - http:
-        paths:
-          - path: /api(/|$)(.*)
-            pathType: Prefix
-            backend:
-              service:
-                name: gmus-backend
-                port:
-                  number: 8080
-          - path: /(.*)
-            backend:
-              service:
-                name: gmus-web
-                port:
-                  number: 8080
+  type: LoadBalancer
+  selector:
+    app: gmus-web
+  ports:
+    - name: http
+      protocol: TCP
+      port: 8080
+      targetPort: 8080
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -146,7 +136,7 @@ volumeBindingMode: WaitForFirstConsumer
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: postgres-pv
+  name: postgres-pv-gmus
   labels:
     app: gmus-database
 spec:
@@ -161,7 +151,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: postgres-pv-claim
+  name: postgres-pv-claim-gmus
   labels:
     app: gmus-database
 spec:
@@ -211,7 +201,7 @@ spec:
       volumes:
         - name: postgres-persistent-storage
           persistentVolumeClaim:
-            claimName: postgres-pv-claim
+            claimName: postgres-pv-claim-gmus
 ---
 apiVersion: v1
 kind: Service