diff --git a/k8s/applications/backend/apigateway/service.yaml b/k8s/applications/backend/apigateway/service.yaml index aa2229a..c8ae3b5 100644 --- 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 diff --git a/k8s/applications/backend/discovery/service.yaml b/k8s/applications/backend/discovery/service.yaml index cb0b810..417c1d2 100644 --- 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 diff --git a/k8s/applications/backend/reserve-check-service/deployment.yaml b/k8s/applications/backend/reserve-check-service/deployment.yaml index 9eb4a6d..ded9ef4 100644 --- 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 \ No newline at end of file + failureThreshold: 3 \ No newline at end of file diff --git a/k8s/applications/backend/reserve-item-service/deployment.yaml b/k8s/applications/backend/reserve-item-service/deployment.yaml index f755a8b..a242176 100644 --- 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 \ No newline at end of file + failureThreshold: 3 \ No newline at end of file diff --git a/k8s/applications/backend/reserve-request-service/deployment.yaml b/k8s/applications/backend/reserve-request-service/deployment.yaml index 2a42ff2..584cfcd 100644 --- 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 \ No newline at end of file + failureThreshold: 3 \ No newline at end of file diff --git a/k8s/applications/backend/user-service/deployment.yaml b/k8s/applications/backend/user-service/deployment.yaml index a51a2da..7d06a9c 100644 --- 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 \ No newline at end of file + failureThreshold: 3 \ No newline at end of file diff --git a/k8s/applications/frontend/admin/service.yaml b/k8s/applications/frontend/admin/service.yaml index da7a3df..1354c41 100644 --- 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 diff --git a/k8s/applications/frontend/portal/service.yaml b/k8s/applications/frontend/portal/service.yaml index b1fd2f9..cde8ba1 100644 --- 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 diff --git a/k8s/environments/jenkins/service.yaml b/k8s/environments/jenkins/service.yaml index be3f163..9374479 100644 --- 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 diff --git a/k8s/environments/logging/elk/kibana/service.yaml b/k8s/environments/logging/elk/kibana/service.yaml index 429b205..20a608f 100644 --- 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 \ No newline at end of file + targetPort: 5601 + nodePort: 30005 \ No newline at end of file diff --git a/k8s/environments/logging/elk/logstash/deplyment.yaml b/k8s/environments/logging/elk/logstash/deplyment.yaml index 56f3f03..481d42f 100644 --- 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 diff --git a/k8s/environments/rabbitmq/service.yaml b/k8s/environments/rabbitmq/service.yaml index 85c926d..7784c4a 100644 --- 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 \ No newline at end of file + targetPort: 15672 + nodePort: 30004 \ No newline at end of file diff --git a/k8s/environments/zipkin/service.yaml b/k8s/environments/zipkin/service.yaml index 4704bf9..dfdfeb4 100644 --- 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 \ No newline at end of file + targetPort: 9411 + nodePort: 30008 \ No newline at end of file