Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: loki s3 overrides #365

Merged
merged 3 commits into from
Apr 23, 2024
Merged

fix: loki s3 overrides #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a1c084
fix: loki s3 irsa annotation override
TristanHoladay Apr 23, 2024
a2fc88c
add loki access key overrides to nightly testing bundle; refactor nig…
TristanHoladay Apr 23, 2024
67ca72b
remove loki.storage.s3.endpoint from loki variables overrides
TristanHoladay Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/bundles/uds-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,16 @@ packages:
path: credentials.useSecret
- name: VELERO_IRSA_ANNOTATION
description: "IRSA ARN annotation to use for Velero"
path: serviceAccount.server.annotations
path: serviceAccount.server.annotations.irsa/role-arn
loki:
loki:
values:
- path: loki.storage.s3.endpoint
value: ""
- path: loki.storage.s3.secretAccessKey
value: ""
- path: loki.storage.s3.accessKeyId
value: ""
variables:
- name: LOKI_CHUNKS_BUCKET
description: "The object storage bucket for Loki chunks"
Expand All @@ -39,12 +46,9 @@ packages:
- name: LOKI_ADMIN_BUCKET
description: "The object storage bucket for Loki admin"
path: loki.storage.bucketNames.admin
- name: LOKI_S3_ENDPOINT
description: "The S3 endpoint"
path: loki.storage.s3.endpoint
- name: LOKI_S3_REGION
description: "The S3 region"
path: loki.storage.s3.region
- name: LOKI_IRSA_ANNOTATION
description: "The irsa role annotation"
path: loki.serviceAccount.annotations
path: serviceAccount.annotations.irsa/role-arn
7 changes: 2 additions & 5 deletions .github/bundles/uds-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@ variables:
loki_ruler_bucket: ${ZARF_VAR_LOKI_S3_BUCKET}
loki_admin_bucket: ${ZARF_VAR_LOKI_S3_BUCKET}
loki_s3_region: ${ZARF_VAR_LOKI_S3_AWS_REGION}
loki_s3-endpoint: ""
loki_irsa_annotation:
eks.amazonaws.com/role-arn: ${ZARF_VAR_LOKI_S3_ROLE_ARN}
loki_irsa_annotation: ${ZARF_VAR_LOKI_S3_ROLE_ARN}
velero_use_secret: false
velero_irsa_annotation:
eks.amazonaws.com/role-arn: "${ZARF_VAR_VELERO_S3_ROLE_ARN}"
velero_irsa_annotation: "${ZARF_VAR_VELERO_S3_ROLE_ARN}"
velero_bucket: ${ZARF_VAR_VELERO_S3_BUCKET}
velero_bucket_region: ${ZARF_VAR_VELERO_S3_AWS_REGION}
velero_bucket_provider_url: ""
Expand Down
7 changes: 2 additions & 5 deletions tasks/iac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,9 @@ tasks:
loki_ruler_bucket: ${LOKI_S3_BUCKET}
loki_admin_bucket: ${LOKI_S3_BUCKET}
loki_s3_region: ${LOKI_S3_AWS_REGION}
loki_s3-endpoint: ""
loki_irsa_annotation:
eks.amazonaws.com/role-arn: "${LOKI_S3_ROLE_ARN}"
loki_irsa_annotation: "${LOKI_S3_ROLE_ARN}"
velero_use_secret: false
velero_irsa_annotation:
eks.amazonaws.com/role-arn: "${VELERO_S3_ROLE_ARN}"
velero_irsa_annotation: ${VELERO_S3_ROLE_ARN}"
velero_bucket: ${VELERO_S3_BUCKET}
velero_bucket_region: ${VELERO_S3_AWS_REGION}
velero_bucket_provider_url: ""
Expand Down