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.

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: CSI driver so that we deploy a defaultStorageClass #196

Merged
merged 2 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 0 deletions tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ echo "::endgroup::"
echo "::group::Configuring Kubernetes"
echo "Authenticate with Kubernetes"
aws eks update-kubeconfig --region us-west-2 --name captain-cluster --role-arn arn:aws:iam::761182885829:role/glueops-captain-role

echo "Show current storageclasses (immediately after bootstrap)"
kubectl get storageclass -A

echo "Delete AWS CNI"
kubectl delete daemonset -n kube-system aws-node
echo "Install Calico CNI"
Expand All @@ -35,6 +39,9 @@ kubectl get nodes
kubectl get pods -A -o=wide
echo "::endgroup::"

echo "Show current storageclasses (before test suite)"
kubectl get storageclass -A

echo "==> Start Test Suite"
./k8s-test.sh
echo "==> Test Suite Complete"
Expand Down
12 changes: 9 additions & 3 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,17 @@ variable "kube_proxy_version" {

locals {

csi_addon_node_tolerations = jsonencode({
map_csi_addon_node_tolerations = {
controller = local.nodeselector_and_pod_tolerations
}

map_csi_default_storage = {
defaultStorageClass = {
enabled = true
}
}

})

csi_addon_node_tolerations = jsonencode(merge(local.map_csi_addon_node_tolerations, local.map_csi_default_storage))

nodeselector_and_pod_tolerations = {
nodeSelector = {
Expand Down
Loading