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

[IBCDPE-1004] Pull back to single AZ #30

Merged
merged 2 commits into from
Aug 22, 2024
Merged

[IBCDPE-1004] Pull back to single AZ #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6007d68
Pull back to single AZ
BryanFauble Aug 22, 2024
d3698aa
Add AF
BryanFauble Aug 22, 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
28 changes: 20 additions & 8 deletions deployments/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,16 @@ module "dpe-sandbox-spacelift-development" {
cluster_name = "dpe-k8-sandbox"
vpc_name = "dpe-sandbox"

vpc_cidr_block = "10.51.0.0/16"
public_subnet_cidrs = ["10.51.1.0/24", "10.51.2.0/24", "10.51.3.0/24"]
private_subnet_cidrs = ["10.51.4.0/24", "10.51.5.0/24", "10.51.6.0/24"]
azs = ["us-east-1a", "us-east-1b", "us-east-1c"]
vpc_cidr_block = "10.51.0.0/16"
# public_subnet_cidrs = ["10.51.1.0/24", "10.51.2.0/24", "10.51.3.0/24"]
# private_subnet_cidrs = ["10.51.4.0/24", "10.51.5.0/24", "10.51.6.0/24"]
# azs = ["us-east-1a", "us-east-1b", "us-east-1c"]
# For now, we are only using one public and one private subnet. This is due to how
# EBS can only be mounted to a single AZ. We will need to revisit this if we want to
# allow usage of EFS ($$$$), or add some kind of EBS volume replication.
public_subnet_cidrs = ["10.51.1.0/24"]
private_subnet_cidrs = ["10.51.4.0/24"]
azs = ["us-east-1a"]
}

module "dpe-sandbox-spacelift-production" {
Expand All @@ -67,8 +73,14 @@ module "dpe-sandbox-spacelift-production" {
cluster_name = "dpe-k8"
vpc_name = "dpe-k8"

vpc_cidr_block = "10.52.0.0/16"
public_subnet_cidrs = ["10.52.1.0/24", "10.52.2.0/24", "10.52.3.0/24"]
private_subnet_cidrs = ["10.52.4.0/24", "10.52.5.0/24", "10.52.6.0/24"]
azs = ["us-east-1a", "us-east-1b", "us-east-1c"]
vpc_cidr_block = "10.52.0.0/16"
# public_subnet_cidrs = ["10.52.1.0/24", "10.52.2.0/24", "10.52.3.0/24"]
# private_subnet_cidrs = ["10.52.4.0/24", "10.52.5.0/24", "10.52.6.0/24"]
# azs = ["us-east-1a", "us-east-1b", "us-east-1c"]
# For now, we are only using one public and one private subnet. This is due to how
# EBS can only be mounted to a single AZ. We will need to revisit this if we want to
# allow usage of EFS ($$$$), or add some kind of EBS volume replication.
public_subnet_cidrs = ["10.52.1.0/24"]
private_subnet_cidrs = ["10.52.4.0/24"]
azs = ["us-east-1a"]
}
60 changes: 30 additions & 30 deletions modules/apache-airflow/templates/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ workers:
# Enable persistent volumes
enabled: true
# Volume size for worker StatefulSet
size: 100Gi
size: 30Gi
# If using a custom storageClass, pass name ref to all statefulSets here
storageClassName:
# Execute init container to chown log directory.
Expand Down Expand Up @@ -639,16 +639,16 @@ workers:
nodeSelector: {}
runtimeClassName: ~
priorityClassName: ~
affinity: {}
affinity:
# default worker affinity is:
# podAntiAffinity:
# preferredDuringSchedulingIgnoredDuringExecution:
# - podAffinityTerm:
# labelSelector:
# matchLabels:
# component: worker
# topologyKey: kubernetes.io/hostname
# weight: 100
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchLabels:
component: worker
topologyKey: kubernetes.io/hostname
weight: 100
tolerations: []
topologySpreadConstraints: []
# hostAliases to use in worker pods.
Expand Down Expand Up @@ -807,16 +807,16 @@ scheduler:

# Select certain nodes for airflow scheduler pods.
nodeSelector: {}
affinity: {}
affinity:
# default scheduler affinity is:
# podAntiAffinity:
# preferredDuringSchedulingIgnoredDuringExecution:
# - podAffinityTerm:
# labelSelector:
# matchLabels:
# component: scheduler
# topologyKey: kubernetes.io/hostname
# weight: 100
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchLabels:
component: scheduler
topologyKey: kubernetes.io/hostname
weight: 100
tolerations: []
topologySpreadConstraints: []

Expand Down Expand Up @@ -1302,7 +1302,7 @@ triggerer:
# Enable persistent volumes
enabled: true
# Volume size for triggerer StatefulSet
size: 100Gi
size: 30Gi
# If using a custom storageClass, pass name ref to all statefulSets here
storageClassName:
# Execute init container to chown log directory.
Expand Down Expand Up @@ -1349,16 +1349,16 @@ triggerer:

# Select certain nodes for airflow triggerer pods.
nodeSelector: {}
affinity: {}
affinity:
# default triggerer affinity is:
# podAntiAffinity:
# preferredDuringSchedulingIgnoredDuringExecution:
# - podAffinityTerm:
# labelSelector:
# matchLabels:
# component: triggerer
# topologyKey: kubernetes.io/hostname
# weight: 100
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchLabels:
component: triggerer
topologyKey: kubernetes.io/hostname
weight: 100
tolerations: []
topologySpreadConstraints: []

Expand Down Expand Up @@ -2300,7 +2300,7 @@ logs:
# Enable persistent volume for storing logs
enabled: false
# Volume size for logs
size: 50Gi
size: 30Gi
# Annotations for the logs PVC
annotations: {}
# If using a custom storageClass, pass name here
Expand Down