diff --git a/src/kubernetes/ticketing-chart/templates/deployment-queuing.yaml b/src/kubernetes/ticketing-chart/templates/deployment-queuing.yaml deleted file mode 100644 index 0b3c5fa..0000000 --- a/src/kubernetes/ticketing-chart/templates/deployment-queuing.yaml +++ /dev/null @@ -1,99 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ticketing-queuing-api - labels: - {{- include "ticketing-chart.queuingLabels" . | nindent 4 }} - namespace: {{ .Values.namespace }} -spec: - selector: - matchLabels: - {{- include "ticketing-chart.queuingSelectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "ticketing-chart.queuingSelectorLabels" . | nindent 8 }} - spec: - nodeSelector: - role: backend - - containers: - - name: ticketing-queuing-api - image: "{{ .Values.queuing_system.image.repository }}:{{ .Values.queuing_system.image.tag }}" - - resources: - requests: - cpu: "100m" - memory: "100Mi" - - imagePullPolicy: Always - command: ['npm', 'run', 'start:api'] - - ports: - - name: http - containerPort: {{ .Values.queuing_system.config.PORT }} - protocol: TCP - - env: - - name: NODE_ENV - value: "{{ .Values.queuing_system.config.NODE_ENV }}" - - name: PORT - value: "{{ .Values.queuing_system.config.PORT }}" - - name: REDIS_HOST - value: "{{ .Values.queuing_system.config.REDIS_HOST }}" - - name: REDIS_PORT - value: "{{ .Values.queuing_system.config.REDIS_PORT }}" - - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ticketing-queuing-job - labels: - {{- include "ticketing-chart.queuingLabels" . | nindent 4 }} - namespace: {{ .Values.namespace }} -spec: - selector: - matchLabels: - {{- include "ticketing-chart.queuingSelectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "ticketing-chart.queuingSelectorLabels" . | nindent 8 }} - spec: - nodeSelector: - role: backend - - containers: - - name: ticketing-queuing-api - image: "{{ .Values.queuing_system.image.repository }}:{{ .Values.queuing_system.image.tag }}" - - resources: - requests: - cpu: "100m" - memory: "100Mi" - - imagePullPolicy: Always - command: ['npm', 'run', 'start:job'] - - env: - - name: NODE_ENV - value: "{{ .Values.queuing_system.config.NODE_ENV }}" - - name: REDIS_HOST - value: "{{ .Values.queuing_system.config.REDIS_HOST }}" - - name: REDIS_PORT - value: "{{ .Values.queuing_system.config.REDIS_PORT }}" - - name: JOB_INTEVAL_SEC - value: "{{ .Values.queuing_system.config.JOB_INTEVAL_SEC }}" - - name: JOB_MOVE_PER_INTEVAL - value: "{{ .Values.queuing_system.config.JOB_MOVE_PER_INTEVAL }}" - - name: JOB_TICKET_EXPIRED_SEC - value: "{{ .Values.queuing_system.config.JOB_TICKET_EXPIRED_SEC }}" \ No newline at end of file diff --git a/src/kubernetes/ticketing-chart/templates/redis.yaml b/src/kubernetes/ticketing-chart/templates/redis.yaml deleted file mode 100644 index 76dc958..0000000 --- a/src/kubernetes/ticketing-chart/templates/redis.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ticketing-redis - labels: - {{- include "ticketing-chart.queuingLabels" . | nindent 4 }} - namespace: {{ .Values.namespace }} -spec: - selector: - matchLabels: - {{- include "ticketing-chart.queuingSelectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "ticketing-chart.queuingSelectorLabels" . | nindent 8 }} - spec: - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - - containers: - - name: redis - image: {{ .Values.redis.image }} - command: - - redis-server - env: - - name: MASTER - value: "true" - ports: - - name: redis - containerPort: {{ .Values.redis.port }} ---- -apiVersion: v1 -kind: Service -metadata: - name: ticketing-redis - namespace: {{ .Values.namespace }} -spec: - type: ClusterIP - ports: - - port: {{ .Values.redis.port }} - targetPort: {{ .Values.redis.port }} - selector: - {{- include "ticketing-chart.queuingSelectorLabels" . | nindent 4 }} \ No newline at end of file diff --git a/src/kubernetes/ticketing-chart/templates/service.yaml b/src/kubernetes/ticketing-chart/templates/service.yaml index 5c71713..95ac85f 100644 --- a/src/kubernetes/ticketing-chart/templates/service.yaml +++ b/src/kubernetes/ticketing-chart/templates/service.yaml @@ -13,19 +13,6 @@ spec: --- apiVersion: v1 kind: Service -metadata: - name: {{ include "ticketing-chart.fullname" . }}-queuing-api - namespace: {{ .Values.namespace }} -spec: - type: ClusterIP - ports: - - port: {{ .Values.queuing_system.config.PORT }} - targetPort: {{ .Values.queuing_system.config.PORT }} - selector: - {{- include "ticketing-chart.queuingSelectorLabels" . | nindent 4 }} ---- -apiVersion: v1 -kind: Service metadata: name: prometheus-grafana-node-port namespace: monitoring