From 02a0e52dbe09fa1ccbbfd7875d04762bda8f2e1d Mon Sep 17 00:00:00 2001 From: Wan Afiq Date: Wed, 5 Feb 2025 09:26:35 +0800 Subject: [PATCH 1/4] Upgrade Gantry pipeline plugin --- docs/deep-dives/arm64.md | 40 +++++++++---------- .../express-rest-api/.buildkite/pipeline.yml | 6 +-- template/koa-rest-api/.buildkite/pipeline.yml | 6 +-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/deep-dives/arm64.md b/docs/deep-dives/arm64.md index 43ab0160d..e73ba0847 100644 --- a/docs/deep-dives/arm64.md +++ b/docs/deep-dives/arm64.md @@ -35,18 +35,18 @@ In a `vCurrent` strategy: schemaVersion: vCurrent clusters: - name: cicd # Existing cluster - + instanceType: t3.large rootVolumeSize: 8 - + # ... -+ ++ + - name: graviton # New cluster; choose a name you like -+ ++ + cpuArchitecture: arm64 + instanceType: t4g.large # Required; g is for Graviton + rootVolumeSize: 8 # Optional -+ ++ + # ... ``` @@ -164,24 +164,24 @@ modify `cpuArchitecture` property on the `ContainerImage` and `Service` resource ```diff kind: ContainerImage - + schemaVersion: v0.0 - + - cpuArchitecture: arm64 + cpuArchitecture: amd64 - + ... ``` ```diff kind: Service - + schemaVersion: v0.0 - + - cpuArchitecture: arm64 + cpuArchitecture: amd64 - + ... ``` @@ -270,7 +270,7 @@ As these have no set naming convention, you can look for: - *aws-sm - *private-npm - *docker-ecr-cache - - seek-jobs/gantry#v3.0.0: + - seek-jobs/gantry#v4.0.0: command: build file: gantry.build.yml # <-- here region: ap-southeast-2 @@ -283,22 +283,22 @@ set the `cpuArchitecture` property on the `ContainerImage` and `Service` resourc ```diff kind: ContainerImage - + schemaVersion: v0.0 - + + cpuArchitecture: arm64 - + ... ``` ```diff kind: Service - + schemaVersion: v0.0 - + + cpuArchitecture: arm64 - + ... ``` @@ -342,10 +342,10 @@ For a [Serverless] worker, set the `provider.architecture` property in [`serverl ```diff provider: name: aws - + + architecture: arm64 runtime: nodejs20.x - + ... ``` diff --git a/template/express-rest-api/.buildkite/pipeline.yml b/template/express-rest-api/.buildkite/pipeline.yml index 76c024ac1..5dac14895 100644 --- a/template/express-rest-api/.buildkite/pipeline.yml +++ b/template/express-rest-api/.buildkite/pipeline.yml @@ -70,7 +70,7 @@ steps: - *aws-sm - *private-npm - *docker-ecr-cache - - seek-jobs/gantry#v3.0.0: + - seek-jobs/gantry#v4.0.0: command: build file: gantry.build.yml region: <%- region %> @@ -87,7 +87,7 @@ steps: concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %> key: deploy-dev plugins: - - seek-jobs/gantry#v3.0.0: + - seek-jobs/gantry#v4.0.0: command: apply environment: <%- devGantryEnvironmentName %> file: gantry.apply.yml @@ -102,7 +102,7 @@ steps: concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %> depends_on: deploy-dev plugins: - - seek-jobs/gantry#v3.0.0: + - seek-jobs/gantry#v4.0.0: command: apply environment: <%- prodGantryEnvironmentName %> file: gantry.apply.yml diff --git a/template/koa-rest-api/.buildkite/pipeline.yml b/template/koa-rest-api/.buildkite/pipeline.yml index 76c024ac1..5dac14895 100644 --- a/template/koa-rest-api/.buildkite/pipeline.yml +++ b/template/koa-rest-api/.buildkite/pipeline.yml @@ -70,7 +70,7 @@ steps: - *aws-sm - *private-npm - *docker-ecr-cache - - seek-jobs/gantry#v3.0.0: + - seek-jobs/gantry#v4.0.0: command: build file: gantry.build.yml region: <%- region %> @@ -87,7 +87,7 @@ steps: concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %> key: deploy-dev plugins: - - seek-jobs/gantry#v3.0.0: + - seek-jobs/gantry#v4.0.0: command: apply environment: <%- devGantryEnvironmentName %> file: gantry.apply.yml @@ -102,7 +102,7 @@ steps: concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %> depends_on: deploy-dev plugins: - - seek-jobs/gantry#v3.0.0: + - seek-jobs/gantry#v4.0.0: command: apply environment: <%- prodGantryEnvironmentName %> file: gantry.apply.yml From 90426d32b9809eae8ae3c3ef08f0791f06ef1f89 Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Wed, 5 Feb 2025 14:13:58 +1100 Subject: [PATCH 2/4] Create twenty-poets-bake.md --- .changeset/twenty-poets-bake.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/twenty-poets-bake.md diff --git a/.changeset/twenty-poets-bake.md b/.changeset/twenty-poets-bake.md new file mode 100644 index 000000000..c6e79f837 --- /dev/null +++ b/.changeset/twenty-poets-bake.md @@ -0,0 +1,5 @@ +--- +'skuba': patch +--- + +template/\*-rest-api: seek-jobs/gantry v4.0.0 From bf993cab44e5a419414bc86b92b5d5f1c2acfd2f Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Mon, 10 Feb 2025 13:27:22 +1100 Subject: [PATCH 3/4] Revert formatting --- docs/deep-dives/arm64.md | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/deep-dives/arm64.md b/docs/deep-dives/arm64.md index e73ba0847..43ab0160d 100644 --- a/docs/deep-dives/arm64.md +++ b/docs/deep-dives/arm64.md @@ -35,18 +35,18 @@ In a `vCurrent` strategy: schemaVersion: vCurrent clusters: - name: cicd # Existing cluster - + instanceType: t3.large rootVolumeSize: 8 - + # ... -+ ++ + - name: graviton # New cluster; choose a name you like -+ ++ + cpuArchitecture: arm64 + instanceType: t4g.large # Required; g is for Graviton + rootVolumeSize: 8 # Optional -+ ++ + # ... ``` @@ -164,24 +164,24 @@ modify `cpuArchitecture` property on the `ContainerImage` and `Service` resource ```diff kind: ContainerImage - + schemaVersion: v0.0 - + - cpuArchitecture: arm64 + cpuArchitecture: amd64 - + ... ``` ```diff kind: Service - + schemaVersion: v0.0 - + - cpuArchitecture: arm64 + cpuArchitecture: amd64 - + ... ``` @@ -270,7 +270,7 @@ As these have no set naming convention, you can look for: - *aws-sm - *private-npm - *docker-ecr-cache - - seek-jobs/gantry#v4.0.0: + - seek-jobs/gantry#v3.0.0: command: build file: gantry.build.yml # <-- here region: ap-southeast-2 @@ -283,22 +283,22 @@ set the `cpuArchitecture` property on the `ContainerImage` and `Service` resourc ```diff kind: ContainerImage - + schemaVersion: v0.0 - + + cpuArchitecture: arm64 - + ... ``` ```diff kind: Service - + schemaVersion: v0.0 - + + cpuArchitecture: arm64 - + ... ``` @@ -342,10 +342,10 @@ For a [Serverless] worker, set the `provider.architecture` property in [`serverl ```diff provider: name: aws - + + architecture: arm64 runtime: nodejs20.x - + ... ``` From c94359d4322d3a1c0201b39c7470b034fe5cf2a3 Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Mon, 10 Feb 2025 13:28:07 +1100 Subject: [PATCH 4/4] Restore changed line --- docs/deep-dives/arm64.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deep-dives/arm64.md b/docs/deep-dives/arm64.md index 43ab0160d..165782ac7 100644 --- a/docs/deep-dives/arm64.md +++ b/docs/deep-dives/arm64.md @@ -270,7 +270,7 @@ As these have no set naming convention, you can look for: - *aws-sm - *private-npm - *docker-ecr-cache - - seek-jobs/gantry#v3.0.0: + - seek-jobs/gantry#v4.0.0: command: build file: gantry.build.yml # <-- here region: ap-southeast-2