diff --git a/charts/airdrop-service/Chart.yaml b/charts/airdrop-service/Chart.yaml index 7626240fd1ce03809df462bd707016e3654d6a84..6e289d7c38859534b578336986c42de8bf85f597 100644 --- a/charts/airdrop-service/Chart.yaml +++ b/charts/airdrop-service/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Airdrop service. name: airdrop-service -version: 0.1.2 +version: 0.2.0 diff --git a/charts/airdrop-service/templates/deployment.yaml b/charts/airdrop-service/templates/deployment.yaml index 70913f4b9a319409d64b8d0dc02eee9a7596aeb5..8970ff2dd8854b907c00f83877525a5940e1fcd9 100644 --- a/charts/airdrop-service/templates/deployment.yaml +++ b/charts/airdrop-service/templates/deployment.yaml @@ -22,26 +22,14 @@ spec: ports: - name: http containerPort: {{ .Values.service.port }} + {{- with .Values.readinessProbe }} readinessProbe: - exec: - command: - - /bin/sh - - -c - - curl --silent http://localhost:{{ .Values.service.port }}/airdrop/actuator/health | grep UP - successThreshold: 1 - failureThreshold: 10 - initialDelaySeconds: 60 - periodSeconds: 5 - timeoutSeconds: 5 +{{ toYaml . | indent 10 }} + {{- end }} + {{- with .Values.livenessProbe }} livenessProbe: - httpGet: - path: /airdrop/actuator/info - port: {{ .Values.service.port }} - successThreshold: 1 - failureThreshold: 10 - initialDelaySeconds: 60 - periodSeconds: 5 - timeoutSeconds: 5 +{{ toYaml . | indent 10 }} + {{- end }} resources: {{ toYaml .Values.resources | indent 12 }} env: diff --git a/charts/airdrop-service/values.yaml b/charts/airdrop-service/values.yaml index 56b903ab093de10253cb775397c9c5c373c595db..2cea37be20e700a3232b965c238be31444258ce3 100644 --- a/charts/airdrop-service/values.yaml +++ b/charts/airdrop-service/values.yaml @@ -2,7 +2,7 @@ replicaCount: 1 image: repository: eu.gcr.io/nynja-ci-201610/airdrop/airdrop-service - tag: stable + tag: master-1 pullPolicy: IfNotPresent gateway: @@ -72,7 +72,7 @@ rest: # LOGGING PROPERTIES logging: level: - root: WARN + root: INFO # QOIN PRO HEADER @@ -80,20 +80,36 @@ logging: authentication: qoinPro: header: - name: 'x-api-key' - value: 'NEzzAZLl0Ma1Jos1bqqfk2TFHTywQ0Qo9IAFaO0y' + name: "x-api-key" + value: "NEzzAZLl0Ma1Jos1bqqfk2TFHTywQ0Qo9IAFaO0y" # QOIN-PRO TOKEN AUTHENTICATION DETAILS users: qoinPro: - client: qoinPro - secret: qoinProSecret - userName: qoinPro - password: qoinProPassword - - - - - - + client: "qoinPro" + secret: "qoinProSecret" + userName: "qoinPro" + password: "qoinProPassword" + +readinessProbe: + exec: + command: + - /bin/sh + - -c + - curl --silent http://localhost:8080/airdrop/actuator/health | grep UP + successThreshold: 1 + failureThreshold: 10 + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 10 + +livenessProbe: + httpGet: + path: /airdrop/actuator/info + port: 8080 + successThreshold: 1 + failureThreshold: 10 + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 10 \ No newline at end of file diff --git a/releases/dev/airdrop-service.yaml b/releases/dev/airdrop-service.yaml index c5edd8d79fa805343a9287ef6da35e75881ff246..f5140f18e7812b0fb639372b164400822388acfe 100644 --- a/releases/dev/airdrop-service.yaml +++ b/releases/dev/airdrop-service.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: airdrop-service - version: 0.1.2 + version: 0.2.0 values: replicaCount: 1 image: @@ -82,4 +82,26 @@ spec: client: "qoinPro" secret: "qoinProSecret" userName: "qoinPro" - password: "qoinProPassword" \ No newline at end of file + password: "qoinProPassword" + # readinessProbe + readinessProbe: + exec: + command: + - /bin/sh + - -c + - curl --silent http://localhost:8080/airdrop/actuator/health | grep UP + successThreshold: 1 + failureThreshold: 10 + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 10 + # livenessProbe + livenessProbe: + httpGet: + path: /airdrop/actuator/info + port: 8080 + successThreshold: 1 + failureThreshold: 10 + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 10 \ No newline at end of file diff --git a/releases/staging/airdrop-service.yaml b/releases/staging/airdrop-service.yaml index c5edd8d79fa805343a9287ef6da35e75881ff246..86577e4a3534caba0e0bd21eda3d5504934ec84c 100644 --- a/releases/staging/airdrop-service.yaml +++ b/releases/staging/airdrop-service.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: airdrop-service - version: 0.1.2 + version: 0.2.0 values: replicaCount: 1 image: @@ -19,7 +19,7 @@ spec: selector: - api-gateway.default.svc.cluster.local hosts: - - airdrop.dev-eu.nynja.net + - airdrop.staging.nynja.net resources: limits: cpu: 200m @@ -55,10 +55,10 @@ spec: # GRPC PROPERTIES grpc: accountService: - host: account.dev-eu.nynja.net + host: account.staging.nynja.net port: 6565 authService: - host: auth.dev-eu.nynja.net + host: auth.staging.nynja.net port: 6565 # REST PROPERTIES rest: @@ -82,4 +82,26 @@ spec: client: "qoinPro" secret: "qoinProSecret" userName: "qoinPro" - password: "qoinProPassword" \ No newline at end of file + password: "qoinProPassword" + # readinessProbe + readinessProbe: + exec: + command: + - /bin/sh + - -c + - curl --silent http://localhost:8080/airdrop/actuator/health | grep UP + successThreshold: 1 + failureThreshold: 10 + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 10 + # livenessProbe + livenessProbe: + httpGet: + path: /airdrop/actuator/info + port: 8080 + successThreshold: 1 + failureThreshold: 10 + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 10 \ No newline at end of file