Skip to content

Commit ccfd690

Browse files
djmitchedjmitche
committed
allow specifying S3 endpoint for queue's deprecated S3 artifacts
1 parent 02fdc2f commit ccfd690

File tree

7 files changed

+19
-3
lines changed

7 files changed

+19
-3
lines changed

‎changelog/issue-5039.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
audience: deployers
2+
level: patch
3+
reference: issue 5039
4+
---
5+
The new `queue.aws_endpoint` Helm configuration value allows setting the endpoint used to access S3 buckets. This configuration enables use of non-AWS S3-compatible backends.

‎dev-docs/dev-config-example.yml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎generated/references.json‎

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎infrastructure/k8s/templates/taskcluster-queue-secret.yaml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎infrastructure/k8s/values.schema.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,9 @@
10251025
"aws_access_key_id": {
10261026
"type": "string"
10271027
},
1028+
"aws_endpoint": {
1029+
"type": "string"
1030+
},
10281031
"aws_secret_access_key": {
10291032
"type": "string"
10301033
},
@@ -1279,7 +1282,8 @@
12791282
"pulse_password",
12801283
"aws_access_key_id",
12811284
"aws_secret_access_key",
1282-
"artifact_region"
1285+
"artifact_region",
1286+
"aws_endpoint"
12831287
],
12841288
"title": "Configuration options for queue",
12851289
"type": "object"

‎services/queue/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ defaults:
103103
accessKeyId: !env AWS_ACCESS_KEY_ID
104104
secretAccessKey: !env AWS_SECRET_ACCESS_KEY
105105
region: !env ARTIFACT_REGION
106+
endpoint: !env AWS_ENDPOINT
106107
apiVersion: 2014-01-01
107108

108109
# new relic config (processed in services/prelude.js)

‎ui/docs/manual/deploying/queue-config.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ That involves the following Helm values:
2929
* `queue.public_artifact_bucket_cdn` (optional)
3030
* `queue.aws_access_key_id`
3131
* `queue.aws_secret_access_key`
32+
* `queue.aws_endpoint` (optional; use this to interface with non-AWS services' S3-compatibility support)
3233

3334
The service uses the public bucket for artifacts having prefix `public/`, and the private bucket for all others.
3435
Both buckets must be in the given `artifact_region`.
3536

36-
3737
In a public deployment of Taskcluster, it may make sense to allow public read access to the public bucket, in which case setting `sign_public_artifact_urls` to false will allow simpler (unsigned) URLs for public artifacts.
3838
A further optional step is to configure a CDN such as CloudFront to serve artifacts from this bucket, with a URL prefix given in `public_artifact_bucket_cdn`.
3939
Paths on the CDN should match those on the bucket, and the configured URL must use `https` and must not end in a `/` character.

0 commit comments

Comments
 (0)