Skip to content

Commit d41d645

Browse files
committed
Do not setup GARDEN_ROOTFS_DRIVER, just provide sane defaults
Eirini doesn't care about the Garden setting, prefer overlay-xfs for default as it is more compatible. Fixes #99
1 parent 3c82f8c commit d41d645

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

modules/scf/defaults.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SCF_HELM_VERSION="${SCF_HELM_VERSION:-}"
1111
SCF_OPERATOR="${SCF_OPERATOR:-false}"
1212
OPERATOR_CHART_URL="${OPERATOR_CHART_URL:-latest}"
1313

14-
GARDEN_ROOTFS_DRIVER="${GARDEN_ROOTFS_DRIVER:-btrfs}"
14+
GARDEN_ROOTFS_DRIVER="${GARDEN_ROOTFS_DRIVER:-overlay-xfs}"
1515
DIEGO_SIZING="${DIEGO_SIZING:-$SIZING}"
1616
STORAGECLASS="${STORAGECLASS:-persistent}"
1717
AUTOSCALER="${AUTOSCALER:-false}"

modules/scf/gen_config.sh

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ if [ "${DEFAULT_STACK}" = "from_chart" ]; then
1010
export DEFAULT_STACK=$(helm inspect helm/cf/ | grep DEFAULT_STACK | sed 's~DEFAULT_STACK:~~g' | sed 's~"~~g' | sed 's~\s~~g')
1111
fi
1212

13-
if [ "$ENABLE_EIRINI" = false ]; then
14-
GARDEN_ROOTFS_DRIVER="${GARDEN_ROOTFS_DRIVER:-overlay-xfs}"
15-
fi
16-
1713
domain=$(kubectl get configmap -n kube-system cap-values -o json | jq -r '.data["domain"]')
1814
public_ip=$(kubectl get configmap -n kube-system cap-values -o json | jq -r '.data["public-ip"]')
1915
aux_external_ips=($(kubectl get nodes -o json | jq -r '.items[].status.addresses[] | select(.type == "InternalIP").address'))

0 commit comments

Comments
 (0)