From 08011fbd4718ed6a51951d378e7eee29a4fc05ff Mon Sep 17 00:00:00 2001 From: Drew Walters Date: Mon, 7 Jun 2021 21:33:47 +0000 Subject: [PATCH] Add ability to configure ViNO flavors ViNO configures application behavior using configMaps generated inside of various kustomization.yaml files [0]; however, we cannot modify them in Treasuremap because they live in the upstream folder. This change adds a mechanism for configuring flavors using patches. Other application configMaps can be overridden the same way. The new default values added for the multi-tenant type are configured for the stl3 site; however, operators can override these values for downstream environments. [0] https://opendev.org/airship/vino/src/branch/master/config/manager/kustomization.yaml Closes #170 Signed-off-by: Drew Walters Change-Id: I73668b15a652cf28b366154a53e62970311d61b8 --- .../target/workload/kustomization.yaml | 7 ++++++- .../target/workload/patches/vino-flavors.yaml | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 manifests/type/multi-tenant/target/workload/patches/vino-flavors.yaml diff --git a/manifests/type/multi-tenant/target/workload/kustomization.yaml b/manifests/type/multi-tenant/target/workload/kustomization.yaml index 89444046a..c25d8e098 100644 --- a/manifests/type/multi-tenant/target/workload/kustomization.yaml +++ b/manifests/type/multi-tenant/target/workload/kustomization.yaml @@ -4,4 +4,9 @@ resources: - ../../../../function/sip - ../../../../function/synclabeller - ../../../../function/vino - - ../../../../function/helm-chart-repository/ \ No newline at end of file + - ../../../../function/helm-chart-repository/ +patchesStrategicMerge: + # NOTE: ViNO uses Kustomize's configMapGenerator feature to configure various + # application behaviors. Override them below using patches. + # https://opendev.org/airship/vino/src/branch/master/config/manager/kustomization.yaml + - patches/vino-flavors.yaml diff --git a/manifests/type/multi-tenant/target/workload/patches/vino-flavors.yaml b/manifests/type/multi-tenant/target/workload/patches/vino-flavors.yaml new file mode 100644 index 000000000..eba685d08 --- /dev/null +++ b/manifests/type/multi-tenant/target/workload/patches/vino-flavors.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: flavors +data: + flavors.yaml: | + flavors: + master: + vcpus: 4 + memory: 16 + rootSize: 128 + worker: + vcpus: 16 + memory: 64 + rootSize: 256