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

Jump to bottom

Add variables to ease separate bucket config #5015

Merged
merged 11 commits into from
Apr 1, 2024
Merged

Add variables to ease separate bucket config #5015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6e415a0
Add variables to ease separate bucket config
Mar 6, 2024
00506b3
Output of make helm
Mar 6, 2024
6a32e73
Merge branch 'master' into 4291-separate-buckets
davidmirror-ops Mar 11, 2024
84739bc
Merge branch 'master' into 4291-separate-buckets
davidmirror-ops Mar 13, 2024
cbcded1
Make Helm 3rd round
Mar 13, 2024
d1b7dee
Merge branch 'master' into 4291-separate-buckets
davidmirror-ops Mar 15, 2024
6eec84f
Merge branch 'master' into 4291-separate-buckets
davidmirror-ops Mar 21, 2024
d220e62
Make Helm
Mar 21, 2024
41dd060
Merge branch 'master' into 4291-separate-buckets
davidmirror-ops Mar 27, 2024
1cfbd35
Make Helm
Apr 1, 2024
87dbc18
Merge branch 'master' into 4291-separate-buckets
davidmirror-ops Apr 1, 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
7 changes: 5 additions & 2 deletions charts/flyte-core/values-eks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ userSettings:
certificateArn: <CERTIFICATE_ARN>
dbPassword: <DB_PASSWORD>
rdsHost: <RDS_HOST>
bucketName: <BUCKET_NAME>
# These two storage buckets could be the same or you could specify different buckets if required. Both keys are required.
# Learn more https://docs.flyte.org/en/latest/concepts/data_management.html#understand-how-flyte-handles-data
bucketName: <METADATA_BUCKET_NAME>
rawDataBucketName: <RAW_DATA_BUCKET_NAME>
logGroup: <LOG_GROUP_NAME>
redisHostUrl: <REDIS_HOST_URL>
redisHostKey: <REDIS_HOST_KEY>
Expand Down Expand Up @@ -239,7 +242,7 @@ configmap:

core:
propeller:
rawoutput-prefix: "s3://{{ .Values.userSettings.bucketName }}/"
rawoutput-prefix: "s3://{{ .Values.userSettings.rawDataBucketName }}/"
workers: 40
gc-interval: 12h
max-workflow-retries: 50
Expand Down
7 changes: 5 additions & 2 deletions charts/flyte-core/values-gcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ userSettings:
googleProjectId: <PROJECT-ID>
dbHost: <CLOUD-SQL-IP>
dbPassword: <DBPASSWORD>
bucketName: <BUCKETNAME>
# These two storage buckets could be the same or you could specify different buckets if required. Both keys are required.
# Learn more https://docs.flyte.org/en/latest/concepts/data_management.html#understand-how-flyte-handles-data
bucketName: <METADATA_BUCKET_NAME>
rawDataBucketName: <RAW_DATA_BUCKET_NAME>
hostName: <HOSTNAME>

#
Expand Down Expand Up @@ -268,7 +271,7 @@ configmap:

core:
propeller:
rawoutput-prefix: "gs://{{ .Values.userSettings.bucketName }}/"
rawoutput-prefix: "gs://{{ .Values.userSettings.rawDataBucketName }}/"
workers: 40
gc-interval: 12h
max-workflow-retries: 50
Expand Down
10 changes: 5 additions & 5 deletions deployment/eks/flyte_aws_scheduler_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ data:
storage.yaml: |
storage:
type: s3
container: "<BUCKET_NAME>"
container: "<METADATA_BUCKET_NAME>"
connection:
auth-type: iam
region: <AWS_REGION>
Expand Down Expand Up @@ -391,7 +391,7 @@ data:
storage.yaml: |
storage:
type: s3
container: "<BUCKET_NAME>"
container: "<METADATA_BUCKET_NAME>"
connection:
auth-type: iam
region: <AWS_REGION>
Expand Down Expand Up @@ -473,7 +473,7 @@ data:
rate: 100
type: bucket
type: batch
rawoutput-prefix: s3://<BUCKET_NAME>/
rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/
workers: 40
workflow-reeval-duration: 30s
webhook:
Expand Down Expand Up @@ -504,7 +504,7 @@ data:
storage.yaml: |
storage:
type: s3
container: "<BUCKET_NAME>"
container: "<METADATA_BUCKET_NAME>"
connection:
auth-type: iam
region: <AWS_REGION>
Expand Down Expand Up @@ -1167,7 +1167,7 @@ spec:
template:
metadata:
annotations:
configChecksum: "59ef5b555bd41c3e854a315f21031c76dfa876455ff8069b989cb6c28ec1f17"
configChecksum: "c2a15ce5dc2fa465986d6006f93450723da58166b3ad5ee35a91cb37d5c39da"
labels:
app.kubernetes.io/name: datacatalog
app.kubernetes.io/instance: flyte
Expand Down
6 changes: 3 additions & 3 deletions deployment/eks/flyte_helm_controlplane_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ data:
storage.yaml: |
storage:
type: s3
container: "<BUCKET_NAME>"
container: "<METADATA_BUCKET_NAME>"
connection:
auth-type: iam
region: <AWS_REGION>
Expand Down Expand Up @@ -357,7 +357,7 @@ data:
storage.yaml: |
storage:
type: s3
container: "<BUCKET_NAME>"
container: "<METADATA_BUCKET_NAME>"
connection:
auth-type: iam
region: <AWS_REGION>
Expand Down Expand Up @@ -872,7 +872,7 @@ spec:
template:
metadata:
annotations:
configChecksum: "59ef5b555bd41c3e854a315f21031c76dfa876455ff8069b989cb6c28ec1f17"
configChecksum: "c2a15ce5dc2fa465986d6006f93450723da58166b3ad5ee35a91cb37d5c39da"
labels:
app.kubernetes.io/name: datacatalog
app.kubernetes.io/instance: flyte
Expand Down
4 changes: 2 additions & 2 deletions deployment/eks/flyte_helm_dataplane_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ data:
rate: 100
type: bucket
type: batch
rawoutput-prefix: s3://<BUCKET_NAME>/
rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/
workers: 40
workflow-reeval-duration: 30s
webhook:
Expand Down Expand Up @@ -168,7 +168,7 @@ data:
storage.yaml: |
storage:
type: s3
container: "<BUCKET_NAME>"
container: "<METADATA_BUCKET_NAME>"
connection:
auth-type: iam
region: <AWS_REGION>
Expand Down
10 changes: 5 additions & 5 deletions deployment/eks/flyte_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ data:
storage.yaml: |
storage:
type: s3
container: "<BUCKET_NAME>"
container: "<METADATA_BUCKET_NAME>"
connection:
auth-type: iam
region: <AWS_REGION>
Expand Down Expand Up @@ -388,7 +388,7 @@ data:
storage.yaml: |
storage:
type: s3
container: "<BUCKET_NAME>"
container: "<METADATA_BUCKET_NAME>"
connection:
auth-type: iam
region: <AWS_REGION>
Expand Down Expand Up @@ -504,7 +504,7 @@ data:
rate: 100
type: bucket
type: batch
rawoutput-prefix: s3://<BUCKET_NAME>/
rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/
workers: 40
workflow-reeval-duration: 30s
webhook:
Expand Down Expand Up @@ -535,7 +535,7 @@ data:
storage.yaml: |
storage:
type: s3
container: "<BUCKET_NAME>"
container: "<METADATA_BUCKET_NAME>"
connection:
auth-type: iam
region: <AWS_REGION>
Expand Down Expand Up @@ -1198,7 +1198,7 @@ spec:
template:
metadata:
annotations:
configChecksum: "59ef5b555bd41c3e854a315f21031c76dfa876455ff8069b989cb6c28ec1f17"
configChecksum: "c2a15ce5dc2fa465986d6006f93450723da58166b3ad5ee35a91cb37d5c39da"
labels:
app.kubernetes.io/name: datacatalog
app.kubernetes.io/instance: flyte
Expand Down
6 changes: 3 additions & 3 deletions deployment/gcp/flyte_helm_controlplane_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ data:
json: ""
project_id: <PROJECT-ID>
scopes: https://www.googleapis.com/auth/cloud-platform
container: "<BUCKETNAME>"
container: "<METADATA_BUCKET_NAME>"
enable-multicontainer: false
limits:
maxDownloadMBs: 10
Expand Down Expand Up @@ -373,7 +373,7 @@ data:
json: ""
project_id: <PROJECT-ID>
scopes: https://www.googleapis.com/auth/cloud-platform
container: "<BUCKETNAME>"
container: "<METADATA_BUCKET_NAME>"
enable-multicontainer: false
limits:
maxDownloadMBs: 10
Expand Down Expand Up @@ -887,7 +887,7 @@ spec:
template:
metadata:
annotations:
configChecksum: "bc69ed841506b28a42ac19bd0884d483472b3d11fe85fe7e546b879aeb30a85"
configChecksum: "905a2a911a85dbf8d4f1dc3be24b9c4fd7bb46481db0e174274d6aea6129b4c"
labels:
app.kubernetes.io/name: datacatalog
app.kubernetes.io/instance: flyte
Expand Down
4 changes: 2 additions & 2 deletions deployment/gcp/flyte_helm_dataplane_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ data:
rate: 100
type: bucket
type: batch
rawoutput-prefix: gs://<BUCKETNAME>/
rawoutput-prefix: gs://<RAW_DATA_BUCKET_NAME>/
workers: 40
workflow-reeval-duration: 30s
webhook:
Expand Down Expand Up @@ -174,7 +174,7 @@ data:
json: ""
project_id: <PROJECT-ID>
scopes: https://www.googleapis.com/auth/cloud-platform
container: "<BUCKETNAME>"
container: "<METADATA_BUCKET_NAME>"
enable-multicontainer: false
limits:
maxDownloadMBs: 10
Expand Down
10 changes: 5 additions & 5 deletions deployment/gcp/flyte_helm_generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ data:
json: ""
project_id: <PROJECT-ID>
scopes: https://www.googleapis.com/auth/cloud-platform
container: "<BUCKETNAME>"
container: "<METADATA_BUCKET_NAME>"
enable-multicontainer: false
limits:
maxDownloadMBs: 10
Expand Down Expand Up @@ -404,7 +404,7 @@ data:
json: ""
project_id: <PROJECT-ID>
scopes: https://www.googleapis.com/auth/cloud-platform
container: "<BUCKETNAME>"
container: "<METADATA_BUCKET_NAME>"
enable-multicontainer: false
limits:
maxDownloadMBs: 10
Expand Down Expand Up @@ -517,7 +517,7 @@ data:
rate: 100
type: bucket
type: batch
rawoutput-prefix: gs://<BUCKETNAME>/
rawoutput-prefix: gs://<RAW_DATA_BUCKET_NAME>/
workers: 40
workflow-reeval-duration: 30s
webhook:
Expand Down Expand Up @@ -554,7 +554,7 @@ data:
json: ""
project_id: <PROJECT-ID>
scopes: https://www.googleapis.com/auth/cloud-platform
container: "<BUCKETNAME>"
container: "<METADATA_BUCKET_NAME>"
enable-multicontainer: false
limits:
maxDownloadMBs: 10
Expand Down Expand Up @@ -1221,7 +1221,7 @@ spec:
template:
metadata:
annotations:
configChecksum: "bc69ed841506b28a42ac19bd0884d483472b3d11fe85fe7e546b879aeb30a85"
configChecksum: "905a2a911a85dbf8d4f1dc3be24b9c4fd7bb46481db0e174274d6aea6129b4c"
labels:
app.kubernetes.io/name: datacatalog
app.kubernetes.io/instance: flyte
Expand Down
Loading