k8s

2021-12-30 17:50:22 +09:00
parent c62eb513e4
commit c8e6106271
13 changed files with 26 additions and 42 deletions
--- a/k8s/applications/backend/apigateway/service.yaml
+++ b/k8s/applications/backend/apigateway/service.yaml
@@ -8,9 +8,11 @@ metadata:
    app: apigateway
    name: apigateway-service
 spec:
+  type: NodePort
  ports:
    - port: 8000
      targetPort: 8000
+      nodePort: 30001
  selector:
    env: production
    tier: backend
--- a/k8s/applications/backend/discovery/service.yaml
+++ b/k8s/applications/backend/discovery/service.yaml
@@ -8,9 +8,11 @@ metadata:
    app: discovery
    name: discovery-service
 spec:
+  type: NodePort
  ports:
    - port: 8761
      targetPort: 8761
+      nodePort: 30002
  selector:
    env: production
    tier: backend
--- a/k8s/applications/backend/reserve-check-service/deployment.yaml
+++ b/k8s/applications/backend/reserve-check-service/deployment.yaml
@@ -84,11 +84,4 @@ spec:
            initialDelaySeconds: 10
            periodSeconds: 10
            successThreshold: 1
-            failureThreshold: 3
-          volumeMounts:
-            - name: backend-volume
-              mountPath: /srv/nfs
-      volumes:
-        - name: backend-volume
-          persistentVolumeClaim:
-            claimName: backend-pvc
+            failureThreshold: 3
--- a/k8s/applications/backend/reserve-item-service/deployment.yaml
+++ b/k8s/applications/backend/reserve-item-service/deployment.yaml
@@ -84,11 +84,4 @@ spec:
            initialDelaySeconds: 10
            periodSeconds: 10
            successThreshold: 1
-            failureThreshold: 3
-          volumeMounts:
-            - name: backend-volume
-              mountPath: /srv/nfs
-      volumes:
-        - name: backend-volume
-          persistentVolumeClaim:
-            claimName: backend-pvc
+            failureThreshold: 3
--- a/k8s/applications/backend/reserve-request-service/deployment.yaml
+++ b/k8s/applications/backend/reserve-request-service/deployment.yaml
@@ -84,11 +84,4 @@ spec:
            initialDelaySeconds: 10
            periodSeconds: 10
            successThreshold: 1
-            failureThreshold: 3
-          volumeMounts:
-            - name: backend-volume
-              mountPath: /srv/nfs
-      volumes:
-        - name: backend-volume
-          persistentVolumeClaim:
-            claimName: backend-pvc
+            failureThreshold: 3
--- a/k8s/applications/backend/user-service/deployment.yaml
+++ b/k8s/applications/backend/user-service/deployment.yaml
@@ -84,11 +84,4 @@ spec:
            initialDelaySeconds: 10
            periodSeconds: 10
            successThreshold: 1
-            failureThreshold: 3
-          volumeMounts:
-            - name: backend-volume
-              mountPath: /srv/nfs
-      volumes:
-        - name: backend-volume
-          persistentVolumeClaim:
-            claimName: backend-pvc
+            failureThreshold: 3
--- a/k8s/applications/frontend/admin/service.yaml
+++ b/k8s/applications/frontend/admin/service.yaml
@@ -8,10 +8,12 @@ metadata:
    app: admin
    name: frontend-admin-service
 spec:
+  type: NodePort
  ports:
    - name: frontend-admin-http
      port: 3000
      targetPort: 3000
+      nodePort: 30011
  selector:
    env: production
    tier: frontend
--- a/k8s/applications/frontend/portal/service.yaml
+++ b/k8s/applications/frontend/portal/service.yaml
@@ -8,10 +8,12 @@ metadata:
    app: portal
    name: frontend-portal-service
 spec:
+  type: NodePort
  ports:
    - name: frontend-portal-http
      port: 3000
      targetPort: 3000
+      nodePort: 30012
  selector:
    env: production
    tier: frontend
--- a/k8s/environments/jenkins/service.yaml
+++ b/k8s/environments/jenkins/service.yaml
@@ -8,9 +8,11 @@ metadata:
    app: jenkins
    name: jenkins-service
 spec:
+  type: NodePort
  ports:
    - port: 8080
      targetPort: 8080
+      nodePort: 30006
  selector:
    env: production
    tier: cicd
@@ -27,9 +29,11 @@ metadata:
    app: jenkins
    name: jenkins-jnlp-service
 spec:
+  type: NodePort
  ports:
    - port: 50000
      targetPort: 50000
+      nodePort: 30007
  selector:
    env: production
    tier: cicd
--- a/k8s/environments/logging/elk/kibana/service.yaml
+++ b/k8s/environments/logging/elk/kibana/service.yaml
@@ -8,6 +8,7 @@ metadata:
    app: kibana
    name: kibana-service
 spec:
+  type: NodePort
  selector:
    env: production
    tier: backend
@@ -16,4 +17,5 @@ spec:
  ports:
  - protocol: TCP
    port: 5601
-    targetPort: 5601
+    targetPort: 5601
+    nodePort: 30005
--- a/k8s/environments/logging/elk/logstash/deplyment.yaml
+++ b/k8s/environments/logging/elk/logstash/deplyment.yaml
@@ -28,13 +28,6 @@ spec:
        image: docker.elastic.co/logstash/logstash:7.10.1
        ports:
          - containerPort: 8088
-        resources:
-          requests:
-            cpu: 300m
-            memory: 512Mi
-          limits:
-            cpu: 300m
-            memory: 512Mi
        volumeMounts:
          - name: logstash-config-volume
            mountPath: /usr/share/logstash/config
--- a/k8s/environments/rabbitmq/service.yaml
+++ b/k8s/environments/rabbitmq/service.yaml
@@ -8,6 +8,7 @@ metadata:
    app: rabbitmq
    name: rabbitmq-service
 spec:
+  type: NodePort
  selector:
    env: production
    tier: backend
@@ -18,7 +19,9 @@ spec:
      protocol: TCP
      port: 5672
      targetPort: 5672
+      nodePort: 30003
    - name: http-15672
      protocol: TCP
      port: 15672
-      targetPort: 15672
+      targetPort: 15672
+      nodePort: 30004
--- a/k8s/environments/zipkin/service.yaml
+++ b/k8s/environments/zipkin/service.yaml
@@ -8,6 +8,7 @@ metadata:
    app: zipkin
    name: zipkin-service
 spec:
+  type: NodePort
  selector:
    env: production
    tier: backend
@@ -17,4 +18,5 @@ spec:
    - name: http-9411
      protocol: TCP
      port: 9411
-      targetPort: 9411
+      targetPort: 9411
+      nodePort: 30008