From b52db8555c81f61e40929fbca80b2a479f6fd105 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 20 Mar 2024 15:02:40 +0100 Subject: [PATCH 1/5] Update score.yaml --- score/score.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/score/score.yaml b/score/score.yaml index fb43959..cf3e1f9 100644 --- a/score/score.yaml +++ b/score/score.yaml @@ -12,7 +12,7 @@ containers: memory: "64Mi" cpu: "25m" variables: - MESSAGE: "Hello, World!" + MESSAGE: "Hello, Paris!" POD_NAME: "${pod.metadata.name}" NAMESPACE_NAME: "${pod.metadata.namespace}" resources: From d0f123f97cd123cfe9d5b6211362c5a82ec907de Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 20 Mar 2024 15:18:32 +0100 Subject: [PATCH 2/5] Update open-pr.yml - SCORE_COMPOSE_VERSION: '0.10.0' --- .github/workflows/open-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/open-pr.yml b/.github/workflows/open-pr.yml index a49fe3b..6c84a96 100644 --- a/.github/workflows/open-pr.yml +++ b/.github/workflows/open-pr.yml @@ -10,7 +10,7 @@ on: env: ENVIRONMENT_ID: pr-${{ github.event.number }} IMAGE_NAME: ${{ secrets.REGISTRY_LOCATION }}-docker.pkg.dev/${{ secrets.PROJECT_ID }}/${{ secrets.REGISTRY_NAME }}/${{ vars.APP_NAME }} - SCORE_COMPOSE_VERSION: 'latest' + SCORE_COMPOSE_VERSION: '0.10.0' SCORE_HELM_VERSION: 'latest' SCORE_HUMANITEC_VERSION: 'latest' WORKLOAD_NAME: my-sample-app From 14829f67f9b943eb14802f6d38c345c8c7f9f6f2 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Thu, 21 Mar 2024 10:31:51 +0100 Subject: [PATCH 3/5] [skip ci] Update score.yaml - escaping for score-compose --- score/score.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/score/score.yaml b/score/score.yaml index cf3e1f9..c4483bb 100644 --- a/score/score.yaml +++ b/score/score.yaml @@ -13,8 +13,8 @@ containers: cpu: "25m" variables: MESSAGE: "Hello, Paris!" - POD_NAME: "${pod.metadata.name}" - NAMESPACE_NAME: "${pod.metadata.namespace}" + POD_NAME: "$${pod.metadata.name}" + NAMESPACE_NAME: "$${pod.metadata.namespace}" resources: dns: type: dns From db41271fd9c8a3b42e6f12e39ceaaf701da83609 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 22 Mar 2024 09:20:33 +0100 Subject: [PATCH 4/5] Update open-pr.yml - SCORE_COMPOSE_VERSION: 'latest' --- .github/workflows/open-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/open-pr.yml b/.github/workflows/open-pr.yml index 6c84a96..a49fe3b 100644 --- a/.github/workflows/open-pr.yml +++ b/.github/workflows/open-pr.yml @@ -10,7 +10,7 @@ on: env: ENVIRONMENT_ID: pr-${{ github.event.number }} IMAGE_NAME: ${{ secrets.REGISTRY_LOCATION }}-docker.pkg.dev/${{ secrets.PROJECT_ID }}/${{ secrets.REGISTRY_NAME }}/${{ vars.APP_NAME }} - SCORE_COMPOSE_VERSION: '0.10.0' + SCORE_COMPOSE_VERSION: 'latest' SCORE_HELM_VERSION: 'latest' SCORE_HUMANITEC_VERSION: 'latest' WORKLOAD_NAME: my-sample-app From c72d6eaaac7141dcdde5dc5c9608fb25cb055f31 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 22 Mar 2024 15:56:56 +0100 Subject: [PATCH 5/5] Kubernetes env var out of score file --- score/humanitec.score.yaml | 8 +++++++- score/score.yaml | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/score/humanitec.score.yaml b/score/humanitec.score.yaml index db54460..21f1bb1 100644 --- a/score/humanitec.score.yaml +++ b/score/humanitec.score.yaml @@ -1,4 +1,10 @@ apiVersion: humanitec.org/v1b1 profile: humanitec/default-module spec: - terminationGracePeriodSeconds: 60 + containers: + my-sample-app: + env: + - name: POD_NAME + value: "${pod.metadata.name}" + - name: NAMESPACE_NAME + value: "${pod.metadata.namespace}" diff --git a/score/score.yaml b/score/score.yaml index c4483bb..d07b8b3 100644 --- a/score/score.yaml +++ b/score/score.yaml @@ -13,8 +13,6 @@ containers: cpu: "25m" variables: MESSAGE: "Hello, Paris!" - POD_NAME: "$${pod.metadata.name}" - NAMESPACE_NAME: "$${pod.metadata.namespace}" resources: dns: type: dns