crowetic/mev-inspect-py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass through AWS creds as well. Turn into a secret. Make all optional for folks not using the export

Browse Source
This commit is contained in:
Luke Van Seters 2022-02-09 08:42:57 -05:00
parent c079ac9aa6
commit 4dbe6ed2d7
4 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tiltfile
View File

@ -95,9 +95,11 @@ local_resource(
)
# if using local S3 exports
# k8s_yaml(configmap_from_dict("mev-inspect-export", inputs = {
# k8s_yaml(secret_from_dict("mev-inspect-export", inputs = {
# "export-bucket-name" : "local-export",
# "export-bucket-region": "us-east-1",
# "export-aws-access-key-id": "foobar",
# "export-aws-secret-access-key": "foobar",
# }))
#
# helm_remote(

18
k8s/mev-inspect-workers/templates/deployment.yaml
View File

@ -93,14 +93,28 @@ spec:
optional: true
- name: EXPORT_BUCKET_NAME
valueFrom:
configMapKeyRef:
secretKeyRef:
name: mev-inspect-export
key: export-bucket-name
optional: true
- name: EXPORT_BUCKET_REGION
valueFrom:
configMapKeyRef:
secretKeyRef:
name: mev-inspect-export
key: export-bucket-region
optional: true
- name: EXPORT_AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: mev-inspect-export
key: export-aws-access-key-id
optional: true
- name: EXPORT_AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: mev-inspect-export
key: export-aws-secret-access-key
optional: true
{{- range .Values.extraEnv }}
- name: {{ .name }}
value: {{ .value }}

18
k8s/mev-inspect/templates/deployment.yaml
View File

@ -93,14 +93,28 @@ spec:
optional: true
- name: EXPORT_BUCKET_NAME
valueFrom:
configMapKeyRef:
secretKeyRef:
name: mev-inspect-export
key: export-bucket-name
optional: true
- name: EXPORT_BUCKET_REGION
valueFrom:
configMapKeyRef:
secretKeyRef:
name: mev-inspect-export
key: export-bucket-region
optional: true
- name: EXPORT_AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: mev-inspect-export
key: export-aws-access-key-id
optional: true
- name: EXPORT_AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: mev-inspect-export
key: export-aws-secret-access-key
optional: true
{{- range .Values.extraEnv }}
- name: {{ .name }}
value: {{ .value }}

10
mev_inspect/s3_export.py
View File

@ -54,6 +54,8 @@ def get_s3_client():
"s3",
endpoint_url=endpoint_url,
region_name=get_export_bucket_region(),
aws_access_key_id=get_export_aws_access_key_id(),
aws_secret_access_key=get_export_aws_secret_access_key(),
)
@ -67,3 +69,11 @@ def get_export_bucket_name() -> str:
def get_export_bucket_region() -> str:
return os.environ["EXPORT_BUCKET_REGION"]
def get_export_aws_access_key_id() -> str:
return os.environ["EXPORT_AWS_ACCESS_KEY_ID"]
def get_export_aws_secret_access_key() -> str:
return os.environ["EXPORT_AWS_SECRET_ACCESS_KEY"]