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

Kustomize: Set up S3 state config variables #22537

Merged
merged 4 commits into from
Feb 8, 2023
Merged

Kustomize: Set up S3 state config variables #22537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb820cc
Set up S3 state config variables.
davinchia Feb 7, 2023
383342b
Add this for stable and stable with resource limits kustomise.
davinchia Feb 7, 2023
be74ac1
Merge branch 'master' into davinchia/fix-state-setup
davinchia Feb 8, 2023
51e0b04
Also add this to the dev integration test scripts.
davinchia Feb 8, 2023
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
3 changes: 3 additions & 0 deletions kube/overlays/dev-integration-test/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ GCS_LOG_BUCKET=
STATE_STORAGE_MINIO_BUCKET_NAME=airbyte-dev-logs
STATE_STORAGE_MINIO_ENDPOINT=http://airbyte-minio-svc:9000

STATE_STORAGE_S3_REGION=
STATE_STORAGE_S3_BUCKET_NAME=

# Docker Resource Limits
JOB_MAIN_CONTAINER_CPU_REQUEST=
JOB_MAIN_CONTAINER_CPU_LIMIT=
Expand Down
2 changes: 2 additions & 0 deletions kube/overlays/dev-integration-test/.secrets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ AWS_SECRET_ACCESS_KEY=minio123
GOOGLE_APPLICATION_CREDENTIALS=
STATE_STORAGE_MINIO_ACCESS_KEY=minio
STATE_STORAGE_MINIO_SECRET_ACCESS_KEY=minio123
STATE_STORAGE_S3_ACCESS_KEY=
STATE_STORAGE_S3_SECRET_ACCESS_KEY=
3 changes: 3 additions & 0 deletions kube/overlays/dev/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ GCS_LOG_BUCKET=
STATE_STORAGE_MINIO_BUCKET_NAME=airbyte-dev-logs
STATE_STORAGE_MINIO_ENDPOINT=http://airbyte-minio-svc:9000

STATE_STORAGE_S3_REGION=
STATE_STORAGE_S3_BUCKET_NAME=

# Docker Resource Limits
JOB_MAIN_CONTAINER_CPU_REQUEST=
JOB_MAIN_CONTAINER_CPU_LIMIT=
Expand Down
2 changes: 2 additions & 0 deletions kube/overlays/dev/.secrets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ AWS_SECRET_ACCESS_KEY=minio123
GOOGLE_APPLICATION_CREDENTIALS=
STATE_STORAGE_MINIO_ACCESS_KEY=minio
STATE_STORAGE_MINIO_SECRET_ACCESS_KEY=minio123
STATE_STORAGE_S3_ACCESS_KEY=
STATE_STORAGE_S3_SECRET_ACCESS_KEY=
3 changes: 3 additions & 0 deletions kube/overlays/stable-with-resource-limits/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ GCS_LOG_BUCKET=
STATE_STORAGE_MINIO_BUCKET_NAME=airbyte-dev-logs
STATE_STORAGE_MINIO_ENDPOINT=http://airbyte-minio-svc:9000

STATE_STORAGE_S3_REGION=
STATE_STORAGE_S3_BUCKET_NAME=

# Docker Resource Limits
JOB_MAIN_CONTAINER_CPU_REQUEST=
JOB_MAIN_CONTAINER_CPU_LIMIT=
Expand Down
2 changes: 2 additions & 0 deletions kube/overlays/stable-with-resource-limits/.secrets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ AWS_SECRET_ACCESS_KEY=minio123
GOOGLE_APPLICATION_CREDENTIALS=
STATE_STORAGE_MINIO_ACCESS_KEY=minio
STATE_STORAGE_MINIO_SECRET_ACCESS_KEY=minio123
STATE_STORAGE_S3_ACCESS_KEY=
STATE_STORAGE_S3_SECRET_ACCESS_KEY=
3 changes: 3 additions & 0 deletions kube/overlays/stable/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ GCS_LOG_BUCKET=
STATE_STORAGE_MINIO_BUCKET_NAME=airbyte-dev-logs
STATE_STORAGE_MINIO_ENDPOINT=http://airbyte-minio-svc:9000

STATE_STORAGE_S3_REGION=
STATE_STORAGE_S3_BUCKET_NAME=

# Docker Resource Limits
JOB_MAIN_CONTAINER_CPU_REQUEST=
JOB_MAIN_CONTAINER_CPU_LIMIT=
Expand Down
2 changes: 2 additions & 0 deletions kube/overlays/stable/.secrets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ AWS_SECRET_ACCESS_KEY=minio123
GOOGLE_APPLICATION_CREDENTIALS=
STATE_STORAGE_MINIO_ACCESS_KEY=minio
STATE_STORAGE_MINIO_SECRET_ACCESS_KEY=minio123
STATE_STORAGE_S3_ACCESS_KEY=
STATE_STORAGE_S3_SECRET_ACCESS_KEY=
20 changes: 20 additions & 0 deletions kube/resources/server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,26 @@ spec:
secretKeyRef:
name: airbyte-secrets
key: STATE_STORAGE_MINIO_SECRET_ACCESS_KEY
- name: STATE_STORAGE_S3_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: airbyte-secrets
key: STATE_STORAGE_S3_SECRET_ACCESS_KEY
- name: STATE_STORAGE_S3_ACCESS_KEY
valueFrom:
secretKeyRef:
name: airbyte-secrets
key: STATE_STORAGE_S3_ACCESS_KEY
- name: STATE_STORAGE_S3_REGION
valueFrom:
configMapKeyRef:
name: airbyte-env
key: STATE_STORAGE_S3_REGION
- name: STATE_STORAGE_S3_BUCKET_NAME
valueFrom:
configMapKeyRef:
name: airbyte-env
key: STATE_STORAGE_S3_BUCKET_NAME
ports:
- containerPort: 8001
volumeMounts:
Expand Down
20 changes: 20 additions & 0 deletions kube/resources/worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,26 @@ spec:
secretKeyRef:
name: airbyte-secrets
key: STATE_STORAGE_MINIO_SECRET_ACCESS_KEY
- name: STATE_STORAGE_S3_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: airbyte-secrets
key: STATE_STORAGE_S3_SECRET_ACCESS_KEY
- name: STATE_STORAGE_S3_ACCESS_KEY
valueFrom:
secretKeyRef:
name: airbyte-secrets
key: STATE_STORAGE_S3_ACCESS_KEY
- name: STATE_STORAGE_S3_REGION
valueFrom:
configMapKeyRef:
name: airbyte-env
key: STATE_STORAGE_S3_REGION
- name: STATE_STORAGE_S3_BUCKET_NAME
valueFrom:
configMapKeyRef:
name: airbyte-env
key: STATE_STORAGE_S3_BUCKET_NAME
- name: CONTAINER_ORCHESTRATOR_ENABLED
valueFrom:
configMapKeyRef:
Expand Down