Skip to content

Inject backend defaults in modules #100

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Inject backend defaults in modules #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b8d536d
Keep btrfs as default for Caasp
mudler Jan 22, 2020
8bac88e
Add test for caasp gen-config defaults
mudler Jan 22, 2020
b685fc3
Get correctly default for DIEGO_SIZING
mudler Jan 22, 2020
94e3e07
Setup default brats values
mudler Jan 22, 2020
74551f9
Consume generated default.sh to allow overrides
mudler Jan 22, 2020
b3dc401
Allow caasp4os backend to override GARDEN_ROOTFS_DRIVER defaults when…
mudler Jan 22, 2020
af5e42b
Add informative output when generating config values
mudler Jan 22, 2020
fd107f2
Expand the GARDEN_ROOTFS_DRIVER unit test
mudler Jan 22, 2020
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
4 changes: 4 additions & 0 deletions backend/caasp4os/defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@
# Caasp4os options
##################

# Override default GARDEN_ROOTFS_DRIVER for all backends default
if [ "$BACKEND" == "caasp4os" ]; then
GARDEN_ROOTFS_DRIVER="${GARDEN_ROOTFS_DRIVER:-btrfs}"
fi
CAASP_VER=${CAASP_VER:-"update"} # devel, staging, update, product
10 changes: 8 additions & 2 deletions modules/scf/defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ SCF_OPERATOR="${SCF_OPERATOR:-false}"
OPERATOR_CHART_URL="${OPERATOR_CHART_URL:-latest}"

GARDEN_ROOTFS_DRIVER="${GARDEN_ROOTFS_DRIVER:-overlay-xfs}"
DIEGO_SIZING="${DIEGO_SIZING:-$SIZING}"
STORAGECLASS="${STORAGECLASS:-persistent}"
AUTOSCALER="${AUTOSCALER:-false}"

Expand All @@ -25,11 +24,18 @@ else
SIZING="${SIZING:-1}"
fi

DIEGO_SIZING="${DIEGO_SIZING:-$SIZING}"

UAA_UPGRADE="${UAA_UPGRADE:-true}"

OVERRIDE="${OVERRIDE:-}"
CONFIG_OVERRIDE="${CONFIG_OVERRIDE:-$OVERRIDE}"

SCF_LOCAL="${SCF_LOCAL:-}"

SCF_TESTGROUP="${SCF_TESTGROUP:-false}"
SCF_TESTGROUP="${SCF_TESTGROUP:-false}"

## Testing
BRATS_BUILDPACK="${BRATS_BUILDPACK:-}"
BRATS_BUILDPACK_URL="${BRATS_BUILDPACK_URL:-}"
BRATS_BUILDPACK_VERSION="${BRATS_BUILDPACK_URL:-}"
12 changes: 10 additions & 2 deletions modules/scf/gen_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#!/bin/bash

. ./defaults.sh
. ../../include/common.sh
. ./defaults.sh # Read build defaults
. .envrc


info "Generating SCF config values"
if [ "${DEFAULT_STACK}" = "from_chart" ]; then
export DEFAULT_STACK=$(helm inspect helm/cf/ | grep DEFAULT_STACK | sed 's~DEFAULT_STACK:~~g' | sed 's~"~~g' | sed 's~\s~~g')
fi
Expand All @@ -18,6 +17,15 @@ for (( i=0; i < ${#aux_external_ips[@]}; i++ )); do
external_ips+=", \"${aux_external_ips[$i]}\""
done

info "Generating SCF config values"
info "\t GARDEN_ROOTFS_DRIVER: $GARDEN_ROOTFS_DRIVER"
info "\t DOMAIN: $domain"
info "\t DEFAULT_STACK: $DEFAULT_STACK"
info "\t ENABLE_EIRINI: $ENABLE_EIRINI"
info "\t AUTOSCALER: $AUTOSCALER"
info "\t HA: $HA"
info "\t SIZING: $SIZING"

VALUES=
if [ "$ENABLE_EIRINI" = true ] ; then
AUTH="rbac"
Expand Down
19 changes: 19 additions & 0 deletions tests/unit_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,25 @@ testConfig() {
AUTOSCALER=true make scf-gen-config
VALUES_FILE="$(cat $ROOT_DIR/buildtest/scf-config-values.yaml)"
assertContains 'generates correctly AUTOSCALER' "$VALUES_FILE" "autoscaler: true"

make clean

export BACKEND=kind
export GARDEN_ROOTFS_DRIVER=test
make buildir scf-gen-config

VALUES_FILE="$(cat $ROOT_DIR/buildtest/scf-config-values.yaml)"
assertContains 'generates correctly GARDEN_ROOTFS_DRIVER ' "$VALUES_FILE" "GARDEN_ROOTFS_DRIVER: \"test\""


make clean

unset GARDEN_ROOTFS_DRIVER
export BACKEND=caasp4os
make buildir scf-gen-config
VALUES_FILE="$(cat $ROOT_DIR/buildtest/scf-config-values.yaml)"
assertContains 'generates correctly GARDEN_ROOTFS_DRIVER for caasp' "$VALUES_FILE" "GARDEN_ROOTFS_DRIVER: \"btrfs\""

}

# Tests backend switch
Expand Down