Skip to content

Commit 648facd

Browse files
committed
Remove enterprise search changes from community branch
1 parent a5fc3fc commit 648facd

File tree

10 files changed

+6
-137
lines changed

10 files changed

+6
-137
lines changed

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

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

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

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

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

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

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ spec:
1717
ignoreUnknownUsers: true
1818
modes:
1919
- SCRAM
20-
certsSecretPrefix: ${MDB_TLS_CERT_SECRET_PREFIX}
21-
tls:
22-
enabled: true
23-
ca: ${MDB_TLS_CA_CONFIGMAP}
2420
agent:
2521
logLevel: INFO
2622
podSpec:
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
echo "Waiting for MongoDB resource to reach Running phase..."
2-
kubectl --context "${K8S_CTX}" -n "${MDB_NS}" wait --for=jsonpath='{.status.phase}'=Running "mongodb/${MDB_RESOURCE_NAME}" --timeout=400s
2+
kubectl --context "${K8S_CTX}" -n "${MDB_NS}" wait --for=jsonpath='{.status.phase}'=Running "mdb/${MDB_RESOURCE_NAME}" --timeout=400s
33
echo; echo "MongoDB resource"
4-
kubectl --context "${K8S_CTX}" -n "${MDB_NS}" get "mongodb/${MDB_RESOURCE_NAME}"
4+
kubectl --context "${K8S_CTX}" -n "${MDB_NS}" get "mdb/${MDB_RESOURCE_NAME}"
55
echo; echo "Pods running in cluster ${K8S_CTX}"
66
kubectl --context "${K8S_CTX}" -n "${MDB_NS}" get pods

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ metadata:
66
spec:
77
# no need to specify source.mongodbResourceRef if MongoDBSearch CR has the same name as MongoDB CR
88
# the operator infer it automatically
9-
security:
10-
tls:
11-
certificateKeySecretRef:
12-
name: ${MDB_SEARCH_TLS_SECRET_NAME}
139
resourceRequirements:
1410
limits:
1511
cpu: "3"

docs/search/02-search-enterprise-deploy/env_variables.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,5 @@ export OPERATOR_HELM_CHART="mongodb/mongodb-kubernetes"
3333
# comma-separated key=value pairs for additional parameters passed to the helm-chart installing the operator
3434
export OPERATOR_ADDITIONAL_HELM_VALUES=""
3535

36-
export MDB_TLS_CERT_SECRET_PREFIX="certs"
37-
export MDB_TLS_CA_CONFIGMAP="${MDB_RESOURCE_NAME}-ca-configmap"
38-
39-
export CERT_MANAGER_NAMESPACE="cert-manager"
40-
export MDB_TLS_SELF_SIGNED_ISSUER="selfsigned-bootstrap-issuer"
41-
export MDB_TLS_CA_CERT_NAME="my-selfsigned-ca"
42-
export MDB_TLS_CA_SECRET_NAME="root-secret"
43-
export MDB_TLS_CA_ISSUER="my-ca-issuer"
44-
export MDB_TLS_SERVER_CERT_SECRET_NAME="${MDB_TLS_CERT_SECRET_PREFIX}-${MDB_RESOURCE_NAME}-cert"
45-
export MDB_SEARCH_TLS_SECRET_NAME="${MDB_RESOURCE_NAME}-search-tls"
46-
47-
export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=${MDB_RESOURCE_NAME}&tls=true"
36+
export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=${MDB_RESOURCE_NAME}"
37+

docs/search/02-search-enterprise-deploy/test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ run 02_0048_configure_prerelease_image_pullsecret.sh
1818
run_for_output 02_0090_helm_add_mogodb_repo.sh
1919
run_for_output 02_0100_install_operator.sh
2020
run 02_0300_create_ops_manager_resources.sh
21-
run 02_0301_install_cert_manager.sh
22-
run 02_0302_configure_tls_prerequisites.sh
23-
run 02_0304_generate_tls_certificates.sh
2421
run 02_0305_create_mongodb_database_resource.sh
2522
run_for_output 02_0310_wait_for_database_resource.sh
2623
run 02_0315_create_mongodb_users.sh
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
Downloading sample database archive...
2-
Detecting mongorestore TLS flag support...
3-
Using --ssl with --sslCAFile
4-
Restoring sample database with TLS
2+
Restoring sample database

scripts/code_snippets/tests/test_kind_search_enterprise_snippets.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ echo "Sourcing env variables for ${CODE_SNIPPETS_FLAVOR} flavor"
3030
# shellcheck disable=SC1090
3131
test -f "${test_dir}/env_variables_${CODE_SNIPPETS_FLAVOR}.sh" && source "${test_dir}/env_variables_${CODE_SNIPPETS_FLAVOR}.sh"
3232

33-
export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-0.${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=${MDB_RESOURCE_NAME}&tls=true&tlsCAFile=/tls/ca.crt"
33+
export MDB_CONNECTION_STRING="mongodb://mdb-user:${MDB_USER_PASSWORD}@${MDB_RESOURCE_NAME}-0.${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local:27017/?replicaSet=${MDB_RESOURCE_NAME}"
3434

3535
${test_dir}/test.sh

0 commit comments

Comments
 (0)