diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5102a7ea..9a6b7b69 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,7 +22,7 @@ jobs: - name: Render values shell: bash - run: yq eval-all 'select(fileIndex == 0) *d select(fileIndex == 1)' deploy/values.yml deploy/values-dev.yml > deploy/merged.yml + run: yq eval-all 'select(fileIndex == 0) *d select(fileIndex == 1)' deploy/values.yml deploy/values-dev.yml | tee deploy/merged.yml - name: Update task definition run: | diff --git a/deploy/task-definition.yml b/deploy/task-definition.yml index 82b960a7..768d63cb 100644 --- a/deploy/task-definition.yml +++ b/deploy/task-definition.yml @@ -5,8 +5,8 @@ containerDefinitions: - image: "{{ .values.image.name }}:{{ .Env.VERSION }}" healthCheck: command: ["CMD-SHELL", "{{ .values.healthcheck.command }}"] - cpu: "{{ .values.resources.cpu }}" - memory: "{{ .values.resources.memory }}" + cpu: {{ .values.resources.cpu }} + memory: {{ .values.resources.memory }} environment: {{- range $key, $val := .values.env }} - name: {{ $key }} diff --git a/deploy/values.yml b/deploy/values.yml index f2579934..52327b04 100644 --- a/deploy/values.yml +++ b/deploy/values.yml @@ -5,8 +5,8 @@ healthcheck: command: "curl -f http://localhost:8080/actuator/health || exit 1" resources: - cpu: 1000m - memory: 4Gi + cpu: 1024 # = 1 vCPU + memory: 4096 # = 4GB env: TZ: Europe/London