Commit 928b218d authored by Thong Kuah's avatar Thong Kuah
Browse files

Merge branch '8558-support-modsecurity-secruleengine' into 'master' 

feat: Add support for modsecurity secruleengine configuration

See merge request gitlab-org/cluster-integration/auto-deploy-image!28
parents 50b31564 393bc3a5

src/bin/auto-deploy

+8 −0
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ function deploy() { 
    secret_name=''

  fi



  if [[ -n "$AUTO_DEVOPS_MODSECURITY_SEC_RULE_ENGINE" ]]; then

    modsecurity_enabled="true"

  fi



  create_application_secret "$track"



  # shellcheck disable=SC2086 # double quote variables to prevent globbing
@@ -161,6 +165,8 @@ function deploy() { 
      --set postgresql.postgresDatabase="$POSTGRES_DB" \

      --set postgresql.imageTag="$POSTGRES_VERSION" \

      --set application.initializeCommand="$DB_INITIALIZE" \

      --set ingress.modSecurity.enabled="$modsecurity_enabled" \

      --set ingress.modSecurity.secRuleEngine="$AUTO_DEVOPS_MODSECURITY_SEC_RULE_ENGINE" \

      $HELM_UPGRADE_EXTRA_ARGS \

      --namespace="$KUBE_NAMESPACE" \

      "$name" \
@@ -204,6 +210,8 @@ function deploy() { 
      --set postgresql.postgresDatabase="$POSTGRES_DB" \

      --set postgresql.imageTag="$POSTGRES_VERSION" \

      --set application.migrateCommand="$DB_MIGRATE" \

      --set ingress.modSecurity.enabled="$modsecurity_enabled" \

      --set ingress.modSecurity.secRuleEngine="$AUTO_DEVOPS_MODSECURITY_SEC_RULE_ENGINE" \

      $HELM_UPGRADE_EXTRA_ARGS \

      --namespace="$KUBE_NAMESPACE" \

      "$name" \