From b8d536d16097b157d1d4c7b5a8e76b9de7be2443 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 22 Jan 2020 09:29:39 +0100 Subject: [PATCH 1/8] Keep btrfs as default for Caasp --- backend/caasp4os/defaults.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/caasp4os/defaults.sh b/backend/caasp4os/defaults.sh index eff12cdf..3a7fbbfb 100644 --- a/backend/caasp4os/defaults.sh +++ b/backend/caasp4os/defaults.sh @@ -3,4 +3,5 @@ # Caasp4os options ################## +GARDEN_ROOTFS_DRIVER="${GARDEN_ROOTFS_DRIVER:-btrfs}" CAASP_VER=${CAASP_VER:-"update"} # devel, staging, update, product From 8bac88ece77de50a031922f640a49d3c70679263 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 22 Jan 2020 09:31:58 +0100 Subject: [PATCH 2/8] Add test for caasp gen-config defaults --- tests/unit_tests.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/unit_tests.sh b/tests/unit_tests.sh index 11bf5158..41737ec1 100755 --- a/tests/unit_tests.sh +++ b/tests/unit_tests.sh @@ -52,6 +52,11 @@ 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" + + + BACKEND=caasp4os make 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 From b685fc358cf4a78b414cf11f63db95caeebee4af Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 22 Jan 2020 11:55:07 +0100 Subject: [PATCH 3/8] Get correctly default for DIEGO_SIZING --- modules/scf/defaults.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/scf/defaults.sh b/modules/scf/defaults.sh index 859e6a52..68901410 100644 --- a/modules/scf/defaults.sh +++ b/modules/scf/defaults.sh @@ -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}" @@ -25,6 +24,8 @@ else SIZING="${SIZING:-1}" fi +DIEGO_SIZING="${DIEGO_SIZING:-$SIZING}" + UAA_UPGRADE="${UAA_UPGRADE:-true}" OVERRIDE="${OVERRIDE:-}" From 94e3e076099fcfa02cd1d0b2247ab1f68f892235 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 22 Jan 2020 11:55:25 +0100 Subject: [PATCH 4/8] Setup default brats values --- modules/scf/defaults.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/scf/defaults.sh b/modules/scf/defaults.sh index 68901410..b894aa47 100644 --- a/modules/scf/defaults.sh +++ b/modules/scf/defaults.sh @@ -33,4 +33,9 @@ CONFIG_OVERRIDE="${CONFIG_OVERRIDE:-$OVERRIDE}" SCF_LOCAL="${SCF_LOCAL:-}" -SCF_TESTGROUP="${SCF_TESTGROUP:-false}" \ No newline at end of file +SCF_TESTGROUP="${SCF_TESTGROUP:-false}" + +## Testing +BRATS_BUILDPACK="${BRATS_BUILDPACK:-}" +BRATS_BUILDPACK_URL="${BRATS_BUILDPACK_URL:-}" +BRATS_BUILDPACK_VERSION="${BRATS_BUILDPACK_URL:-}" \ No newline at end of file From 74551f9c8d19d1ba99e89c6ef59da7193f33dafd Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 22 Jan 2020 11:58:32 +0100 Subject: [PATCH 5/8] Consume generated default.sh to allow overrides Otherwise we keep consuming modules defaults which are already generated --- modules/scf/gen_config.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/scf/gen_config.sh b/modules/scf/gen_config.sh index 48a57528..8e5e878e 100755 --- a/modules/scf/gen_config.sh +++ b/modules/scf/gen_config.sh @@ -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 From b3dc401235c5c4c4edae34e0ba46f551d7050e38 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 22 Jan 2020 11:59:19 +0100 Subject: [PATCH 6/8] Allow caasp4os backend to override GARDEN_ROOTFS_DRIVER defaults when selected --- backend/caasp4os/defaults.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/caasp4os/defaults.sh b/backend/caasp4os/defaults.sh index 3a7fbbfb..0cc3cacf 100644 --- a/backend/caasp4os/defaults.sh +++ b/backend/caasp4os/defaults.sh @@ -3,5 +3,8 @@ # Caasp4os options ################## -GARDEN_ROOTFS_DRIVER="${GARDEN_ROOTFS_DRIVER:-btrfs}" +# 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 From af5e42b9dc84cfe202c743d81196a99a0d6325be Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 22 Jan 2020 11:59:35 +0100 Subject: [PATCH 7/8] Add informative output when generating config values --- modules/scf/gen_config.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/scf/gen_config.sh b/modules/scf/gen_config.sh index 8e5e878e..9bcc6fb1 100755 --- a/modules/scf/gen_config.sh +++ b/modules/scf/gen_config.sh @@ -17,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" From fd107f2f4f36c59bef26631d877e3154346e5c60 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Wed, 22 Jan 2020 11:59:50 +0100 Subject: [PATCH 8/8] Expand the GARDEN_ROOTFS_DRIVER unit test --- tests/unit_tests.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/unit_tests.sh b/tests/unit_tests.sh index 41737ec1..e6d79ab1 100755 --- a/tests/unit_tests.sh +++ b/tests/unit_tests.sh @@ -53,10 +53,24 @@ testConfig() { 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\"" - BACKEND=caasp4os make scf-gen-config + + 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