Commit f6edc0f7 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Minor change in variable name

parent 9d5c7070

helm/scripts/install_capif.sh

+1 −1
Original line number Diff line number Diff line
@@ -138,4 +138,4 @@ helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART 
--set mongo-express.ingress.hosts[0].host="mongo-express-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \

--set mongo-express.ingress.hosts[0].paths[0].path="/" \

--set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \

--wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG
 
--wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES_RESERVE $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG

helm/scripts/variables.sh

+5 −5
Original line number Diff line number Diff line
@@ -58,14 +58,14 @@ export MONITORING_SERVICE_NAME=monitoring 
export MONITORING_SNOOKER_ENABLED=false



# OpenCAPIF deployment variables

export CAPIF_RESOURCES="NONE"

export CAPIF_RESOURCES_RESERVE="YES"

export CAPIF_RESOURCES_LIMITS_CPU=100m

export CAPIF_RESOURCES_LIMITS_MEMORY=128Mi

export CAPIF_RESOURCES_REQUESTS_CPU=100m

export CAPIF_RESOURCES_REQUESTS_MEMORY=128Mi

## Storage Class

export CAPIF_STORAGE_CLASS=nfs-01

export CAPIF_STORAGE_ACCESS_MODE="ReadWriteOnce"

export CAPIF_STORAGE_ACCESS_MODE="ReadWriteMany"

export CAPIF_GRAFANA_STORAGE_SIZE=10Gi

export CAPIF_LOKI_STORAGE_SIZE=100Mi

export CAPIF_MONGO_STORAGE_SIZE=8Gi
@@ -140,12 +140,12 @@ capif_services=("fluentbit" 
"redis"

"renderer")



if [ "$CAPIF_RESOURCES" == "NONE" ]; then

if [ "$CAPIF_RESOURCES_RESERVE" == "NO" ]; then

    echo "No Limits will be requested on deployment"

    CAPIF_RESOURCES=""

    CAPIF_RESOURCES_RESERVE=""

else

    for service in "${capif_services[@]}"; do

        CAPIF_RESOURCES="--set $service.resources.limits.cpu=$CAPIF_RESOURCES_LIMITS_CPU

        CAPIF_RESOURCES_RESERVE="--set $service.resources.limits.cpu=$CAPIF_RESOURCES_LIMITS_CPU

        --set $service.resources.limits.memory=$CAPIF_RESOURCES_LIMITS_MEMORY

        --set $service.resources.requests.cpu=$CAPIF_RESOURCES_REQUESTS_CPU

        --set $service.resources.requests.memory=$CAPIF_RESOURCES_REQUESTS_MEMORY "