Skip to content

Commit 2cb66ab

Browse files
committed
fix: helm-operations.sh for sonarcloud exceptions and update wiab-staging based on review
1 parent 10c696a commit 2cb66ab

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

bin/helm-operations.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ BASE_DIR="${BASE_DIR:-/wire-server-deploy}"
77
TARGET_SYSTEM="${TARGET_SYSTEM:-example.com}"
88
CERT_MASTER_EMAIL="certmaster@${CERT_MASTER_EMAIL}:-certmaster@${TARGET_SYSTEM}"
99

10-
# DEPLOY_CERT_MANAGER env variable to decide to check if cert_manager and nginx-ingress-services charts should get deployed
10+
# DEPLOY_CERT_MANAGER env variable is used to decide if cert_manager and nginx-ingress-services charts should get deployed
1111
# default is set to TRUE to deploy it unless changed
1212
DEPLOY_CERT_MANAGER="${DEPLOY_CERT_MANAGER:-TRUE}"
1313

@@ -24,9 +24,11 @@ HOST_IP=$(wget -qO- https://api.ipify.org)
2424
fi
2525

2626
function dump_debug_logs {
27+
local exit_code=$?
2728
if [[ "$DUMP_LOGS_ON_FAIL" == "TRUE" ]]; then
2829
"$BASE_DIR"/bin/debug_logs.sh
2930
fi
31+
return $exit_code
3032
}
3133
trap dump_debug_logs ERR
3234

@@ -49,6 +51,7 @@ sync_pg_secrets() {
4951
echo "⚠️ Warning: PostgreSQL secret 'wire-postgresql-secret' not found, skipping secret sync"
5052
echo " Make sure databases-ephemeral chart is deployed before wire-server"
5153
fi
54+
return $?
5255
}
5356

5457
# Creates values.yaml from prod-values.example.yaml and secrets.yaml from prod-secrets.example.yaml

offline/wiab-staging.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Since the inventory is ready, please continue with the following steps:
153153

154154
**TLS / certificate behavior (cert-manager vs. Bring Your Own):**
155155
- By default, `bin/helm-operations.sh` has `DEPLOY_CERT_MANAGER=TRUE`, which installs cert-manager and configures a Let’s Encrypt (HTTP-01) issuer for the ingress charts.
156-
- If you **do not** want Let’s Encrypt / cert-manager (for example, you are using **[Bring Your Own certificates](docs_ubuntu_22.04.md#acquiring--deploying-ssl-certificates)**), disable this step by passing env variable `DEPLOY_CERT_MANAGER=FALSE` when running `bin/helm-operations.sh`.
156+
- If you **do not** want Let’s Encrypt / cert-manager (for example, you are using **[Bring Your Own certificates](docs_ubuntu_22.04.md#acquiring--deploying-ssl-certificates)**), disable this step by passing the environment variable `DEPLOY_CERT_MANAGER=FALSE` when running `bin/helm-operations.sh`.
157157
- When choosing `DEPLOY_CERT_MANAGER=FALSE`, ensure your ingress is configured with your own TLS secret(s) as described at [Acquiring / Deploying SSL Certificates](docs_ubuntu_22.04.md#acquiring--deploying-ssl-certificates).
158158
- When choosing `DEPLOY_CERT_MANAGER=TRUE`, ensure if further network configuration is required by following [cert-manager behaviour in NAT / bridge environments](#cert-manager-behaviour-in-nat--bridge-environments).
159159

@@ -240,8 +240,8 @@ When cert-manager performs HTTP-01 self-checks inside the cluster, traffic can h
240240

241241
In NAT/bridge setups (for example, using `virbr0` on the host):
242242

243-
- If nftables rules DNAT in `PREROUTING` without a matching SNAT on `virbr0 → virbr0`, return packets may bypass the host and break conntrack, causing HTTP-01 timeouts and certificate verification failures.
244-
- Strict `rp_filter` can drop asymmetric return packets.
243+
- If nftables DNAT rules exist in `PREROUTING` without a matching SNAT on `virbr0 → virbr0`, return packets may bypass the host and break conntrack, causing HTTP-01 timeouts and certificate verification failures.
244+
- too strict of `rp_filter` settings can drop asymmetric return packets.
245245

246246
Before changing anything, first verify whether certificate issuance is actually failing:
247247

0 commit comments

Comments
 (0)