Skip to content

Commit 8d95b3f

Browse files
committed
address pr comments
1 parent 714b2cc commit 8d95b3f

File tree

8 files changed

+51
-220
lines changed

8 files changed

+51
-220
lines changed
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
required=(
2+
K8S_CTX
3+
MDB_NS
4+
MDB_RESOURCE_NAME
5+
MDB_VERSION
6+
MDB_MEMBERS
7+
CERT_MANAGER_NAMESPACE
8+
MDB_TLS_CA_SECRET_NAME
9+
MDB_TLS_SERVER_CERT_SECRET_NAME
10+
MDB_SEARCH_TLS_SECRET_NAME
11+
MDB_ADMIN_USER_PASSWORD
12+
MDB_SEARCH_SYNC_USER_PASSWORD
13+
MDB_USER_PASSWORD
14+
OPERATOR_HELM_CHART
15+
)
16+
17+
optional=(
18+
OPERATOR_ADDITIONAL_HELM_VALUES
19+
PRERELEASE_IMAGE_PULLSECRET
20+
)
21+
22+
missing_req=()
23+
for v in "${required[@]}"; do [[ -n "${!v:-}" ]] || missing_req+=("$v"); done
24+
if (( ${#missing_req[@]} )); then
25+
echo "ERROR: Missing required environment variables:" >&2
26+
for m in "${missing_req[@]}"; do echo " - $m" >&2; done
27+
exit 1
28+
fi
29+
30+
missing_opt=()
31+
for v in "${optional[@]}"; do [[ -n "${!v:-}" ]] || missing_opt+=("$v"); done
32+
33+
echo "All required environment variables present."
34+
if (( ${#missing_opt[@]} )); then
35+
echo "Optional variables missing (will continue): ${missing_opt[*]}"
36+
fi
Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
create_secret() {
2-
local secret_name="$1"
3-
local password_var="$2"
1+
# Create admin user secret
2+
kubectl create secret generic mdb-admin-user-password \
3+
--from-literal=password="${MDB_ADMIN_USER_PASSWORD}" \
4+
--dry-run=client -o yaml | kubectl apply --context "${K8S_CTX}" --namespace "${MDB_NS}" -f -
45

5-
kubectl create secret generic "${secret_name}" \
6-
--from-literal=password="${password_var}" \
7-
--dry-run=client -o yaml \
8-
| kubectl apply --context "${K8S_CTX}" --namespace "${MDB_NS}" -f -
9-
}
6+
# Create search sync source user secret
7+
kubectl create secret generic "${MDB_RESOURCE_NAME}-search-sync-source-password" \
8+
--from-literal=password="${MDB_SEARCH_SYNC_USER_PASSWORD}" \
9+
--dry-run=client -o yaml | kubectl apply --context "${K8S_CTX}" --namespace "${MDB_NS}" -f -
1010

11-
create_secret "mdb-admin-user-password" "${MDB_ADMIN_USER_PASSWORD}"
12-
create_secret "${MDB_RESOURCE_NAME}-search-sync-source-password" "${MDB_SEARCH_SYNC_USER_PASSWORD}"
13-
create_secret "mdb-user-password" "${MDB_USER_PASSWORD}"
11+
# Create regular user secret
12+
kubectl create secret generic mdb-user-password \
13+
--from-literal=password="${MDB_USER_PASSWORD}" \
14+
--dry-run=client -o yaml | kubectl apply --context "${K8S_CTX}" --namespace "${MDB_NS}" -f -
15+
16+
echo "User secrets created."

docs/search/01-search-community-deploy/code_snippets/01_0306_configure_cert_manager_tls.sh

Lines changed: 0 additions & 159 deletions
This file was deleted.

docs/search/01-search-community-deploy/code_snippets/01_0306_install_cert_manager.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
required=(
2-
K8S_CTX
3-
CERT_MANAGER_NAMESPACE
4-
)
5-
missing=()
6-
for var in "${required[@]}"; do
7-
[[ -n "${!var:-}" ]] || missing+=("${var}")
8-
done
9-
if (( ${#missing[@]} )); then
10-
echo "Missing required environment variables: ${missing[*]}" >&2
11-
exit 1
12-
fi
13-
141
helm repo add jetstack https://charts.jetstack.io --force-update >/dev/null 2>&1 || true
152
helm upgrade --install \
163
cert-manager jetstack/cert-manager \

docs/search/01-search-community-deploy/code_snippets/01_0307_prepare_cert_manager_issuer.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
required=(
2-
K8S_CTX
3-
MDB_NS
4-
MDB_RESOURCE_NAME
5-
MDB_TLS_CA_SECRET_NAME
6-
)
7-
missing=()
8-
for var in "${required[@]}"; do
9-
[[ -n "${!var:-}" ]] || missing+=("${var}")
10-
done
11-
if (( ${#missing[@]} )); then
12-
echo "Missing required environment variables: ${missing[*]}" >&2
13-
exit 1
14-
fi
15-
161
self_signed_issuer="${MDB_RESOURCE_NAME}-selfsigned-issuer"
172
ca_cert_name="${MDB_RESOURCE_NAME}-ca"
183
ca_issuer="${MDB_RESOURCE_NAME}-ca-issuer"

docs/search/01-search-community-deploy/code_snippets/01_0308_issue_tls_certificates.sh

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
required=(
2-
K8S_CTX
3-
MDB_NS
4-
MDB_RESOURCE_NAME
5-
MDB_MEMBERS
6-
MDB_TLS_CA_SECRET_NAME
7-
MDB_TLS_SERVER_CERT_SECRET_NAME
8-
MDB_SEARCH_TLS_SECRET_NAME
9-
)
10-
missing=()
11-
for var in "${required[@]}"; do
12-
[[ -n "${!var:-}" ]] || missing+=("${var}")
13-
done
14-
if (( ${#missing[@]} )); then
15-
echo "Missing required environment variables: ${missing[*]}" >&2
16-
exit 1
17-
fi
18-
191
ca_issuer="${MDB_RESOURCE_NAME}-ca-issuer"
202
server_certificate="${MDB_RESOURCE_NAME}-server-tls"
213
search_certificate="${MDB_RESOURCE_NAME}-search-tls"
@@ -31,8 +13,6 @@ mongo_dns_names+=(
3113
)
3214

3315
search_dns_names=(
34-
"${MDB_RESOURCE_NAME}-search-0"
35-
"${MDB_RESOURCE_NAME}-search-0.${MDB_RESOURCE_NAME}-search-svc.${MDB_NS}.svc.cluster.local"
3616
"${MDB_RESOURCE_NAME}-search-svc.${MDB_NS}.svc.cluster.local"
3717
)
3818

docs/search/01-search-community-deploy/test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ cd "${script_dir}"
1111

1212
prepare_snippets
1313

14+
run 01_0040_validate_env.sh
1415
run 01_0045_create_namespaces.sh
1516
run 01_0046_create_image_pull_secrets.sh
1617
run 01_0048_configure_prerelease_image_pullsecret.sh

docs/search/02-search-enterprise-deploy/code_snippets/02_0304_generate_tls_certificates.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ spec:
4040
- server auth
4141
- client auth
4242
dnsNames:
43-
- "${MDB_RESOURCE_NAME}-search-0"
44-
- "${MDB_RESOURCE_NAME}-search-0.${MDB_RESOURCE_NAME}-search-svc.${MDB_NS}.svc.cluster.local"
4543
- "${MDB_RESOURCE_NAME}-search-svc.${MDB_NS}.svc.cluster.local"
4644
EOF_MANIFEST
4745

0 commit comments

Comments
 (0)