diff --git a/docs/search/02-search-enterprise-deploy/code_snippets/02_0080_helm_login_to_prerelease_registry.sh b/docs/search/02-search-enterprise-deploy/code_snippets/02_0080_helm_login_to_prerelease_registry.sh deleted file mode 100755 index 0fedc97c2..000000000 --- a/docs/search/02-search-enterprise-deploy/code_snippets/02_0080_helm_login_to_prerelease_registry.sh +++ /dev/null @@ -1,8 +0,0 @@ -if [[ "${PRERELEASE_IMAGE_PULLSECRET:-""}" == "" ]]; then return 0; fi - -user=$(echo -n "${PRERELEASE_IMAGE_PULLSECRET}" | base64 -d | jq -r '.auths."quay.io".auth' | base64 -d | cut -d ':' -f1) -password=$(echo -n "${PRERELEASE_IMAGE_PULLSECRET}" | base64 -d | jq -r '.auths."quay.io".auth' | base64 -d | cut -d ':' -f2) -echo -e "${password}" | \ - helm registry login \ - --username "${user}" \ - --password-stdin quay.io/mongodb/staging/helm-chart diff --git a/docs/search/02-search-enterprise-deploy/code_snippets/02_0305_create_mongodb_database_resource.sh b/docs/search/02-search-enterprise-deploy/code_snippets/02_0305_create_mongodb_database_resource.sh index 4b55a18e2..3c3454875 100755 --- a/docs/search/02-search-enterprise-deploy/code_snippets/02_0305_create_mongodb_database_resource.sh +++ b/docs/search/02-search-enterprise-deploy/code_snippets/02_0305_create_mongodb_database_resource.sh @@ -5,7 +5,7 @@ metadata: name: ${MDB_RESOURCE_NAME} spec: members: 3 - version: ${MDB_VERSION}-ent + version: ${MDB_VERSION} type: ReplicaSet opsManager: configMapRef: @@ -18,18 +18,17 @@ spec: modes: - SCRAM agent: - logLevel: DEBUG - statefulSet: - spec: - template: - spec: - containers: - - name: mongodb-enterprise-database - resources: - limits: - cpu: "2" - memory: 2Gi - requests: - cpu: "1" - memory: 1Gi + logLevel: INFO + podSpec: + podTemplate: + spec: + containers: + - name: mongodb-enterprise-database + resources: + limits: + cpu: "2" + memory: 2Gi + requests: + cpu: "1" + memory: 1Gi EOF diff --git a/docs/search/02-search-enterprise-deploy/code_snippets/02_0315_create_mongodb_users.sh b/docs/search/02-search-enterprise-deploy/code_snippets/02_0315_create_mongodb_users.sh index 8445c1c22..7f08aaf15 100755 --- a/docs/search/02-search-enterprise-deploy/code_snippets/02_0315_create_mongodb_users.sh +++ b/docs/search/02-search-enterprise-deploy/code_snippets/02_0315_create_mongodb_users.sh @@ -25,7 +25,7 @@ EOF # For MongoDB <8.2, the operator will be creating the searchCoordinator custom role automatically # From MongoDB 8.2, searchCoordinator role will be a built-in role. kubectl --context "${K8S_CTX}" --namespace "${MDB_NS}" \ - create secret generic mdb-rs-search-sync-source-password \ + create secret generic "${MDB_RESOURCE_NAME}-search-sync-source-password" \ --from-literal=password="${MDB_SEARCH_SYNC_USER_PASSWORD}" kubectl apply --context "${K8S_CTX}" -n "${MDB_NS}" -f - < switched to db sample_mflix -mdb-rs [primary] sample_mflix> ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... [ - { - plot: 'A sports agent stages an unconventional recruitment strategy to get talented Indian cricket players to play Major League Baseball.', - genres: [ 'Biography', 'Drama', 'Sport' ], - title: 'Million Dollar Arm', - released: ISODate('2014-05-16T00:00:00.000Z') - }, - { - plot: 'A Taiwanese high school baseball team travels to Japan in 1931 to compete in a national tournament.', - genres: [ 'Biography', 'Drama', 'History' ], - title: 'Kano', - released: ISODate('2014-02-27T00:00:00.000Z') - }, - { - plot: "12-year-old Josh is a mixed race boy and a promising baseball player. He is abused by his mother's boyfriend Byrd, and neglected by his mother Debbie. He forges his own path in life when ...", - genres: [ 'Drama' ], - title: 'Calloused Hands', - released: ISODate('2013-03-03T00:00:00.000Z') - } -] -mdb-rs [primary] sample_mflix> \ No newline at end of file diff --git a/docs/search/03-search-query-usage/output/03_0455_execute_vector_search_query.out b/docs/search/03-search-query-usage/output/03_0455_execute_vector_search_query.out deleted file mode 100644 index 1623a6fdc..000000000 --- a/docs/search/03-search-query-usage/output/03_0455_execute_vector_search_query.out +++ /dev/null @@ -1,54 +0,0 @@ -mdb-rs [primary] test> switched to db sample_mflix -mdb-rs [primary] sample_mflix> ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... [ - { - plot: 'At the age of 21, Tim discovers he can travel in time and change what happens and has happened in his own life. His decision to make his world a better place by getting a girlfriend turns out not to be as easy as you might think.', - title: 'About Time', - score: 0.7704131603240967 - }, - { - plot: 'A psychiatrist makes multiple trips through time to save a woman that was murdered by her brutal husband.', - title: 'Retroactive', - score: 0.7597770690917969 - }, - { - plot: 'An officer for a security agency that regulates time travel, must fend for his life against a shady politician who has a tie to his past.', - title: 'Timecop', - score: 0.7574796676635742 - }, - { - plot: 'A time-travel experiment in which a robot probe is sent from the year 2073 to the year 1973 goes terribly wrong thrusting one of the project scientists, a man named Nicholas Sinclair into a...', - title: 'A.P.E.X.', - score: 0.7573235034942627 - }, - { - plot: 'After visiting 2015, Marty McFly must repeat his visit to 1955 to prevent disastrous changes to 1985... without interfering with his first trip.', - title: 'Back to the Future Part II', - score: 0.751945972442627 - }, - { - plot: 'A reporter, learning of time travelers visiting 20th century disasters, tries to change the history they know by averting upcoming disasters.', - title: 'Thrill Seekers', - score: 0.7503504753112793 - }, - { - plot: 'Hoping to alter the events of the past, a 19th century inventor instead travels 800,000 years into the future, where he finds humankind divided into two warring races.', - title: 'The Time Machine', - score: 0.750007152557373 - }, - { - plot: 'Lyle, a motorcycle champion is traveling the Mexican desert, when he find himself in the action radius of a time machine. So he find himself one century back in the past between rapists, ...', - title: 'Timerider: The Adventure of Lyle Swann', - score: 0.7499568462371826 - }, - { - plot: 'A romantic drama about a Chicago librarian with a gene that causes him to involuntarily time travel, and the complications it creates for his marriage.', - title: "The Time Traveler's Wife", - score: 0.7492842674255371 - }, - { - plot: 'A modern aircraft carrier is thrown back in time to 1941 near Hawaii, just hours before the Japanese attack on Pearl Harbor.', - title: 'The Final Countdown', - score: 0.7472751140594482 - } -] -mdb-rs [primary] sample_mflix> \ No newline at end of file diff --git a/docs/search/04-search-external-mongod/code_snippets/04_0320_create_mongodb_search_resource.sh b/docs/search/04-search-external-mongod/code_snippets/04_0320_create_mongodb_search_resource.sh index 85ce3f4d5..ee63f8758 100644 --- a/docs/search/04-search-external-mongod/code_snippets/04_0320_create_mongodb_search_resource.sh +++ b/docs/search/04-search-external-mongod/code_snippets/04_0320_create_mongodb_search_resource.sh @@ -15,7 +15,7 @@ spec: key: keyfile username: search-sync-source passwordSecretRef: - name: mdbc-rs-search-sync-source-password + name: ${MDB_RESOURCE_NAME}-search-sync-source-password key: password resourceRequirements: limits: diff --git a/scripts/dev/contexts/public_kind_code_snippets b/scripts/dev/contexts/public_kind_code_snippets index 83d816c43..c3c5754ef 100644 --- a/scripts/dev/contexts/public_kind_code_snippets +++ b/scripts/dev/contexts/public_kind_code_snippets @@ -12,3 +12,4 @@ source "${script_dir}/root-context" export NAMESPACE=mongodb export CODE_SNIPPETS_FLAVOR=e2e_public export CODE_SNIPPETS_COMMIT_OUTPUT=true +export ops_manager_version="cloud_qa" diff --git a/scripts/dev/install.sh b/scripts/dev/install.sh index aceeda95a..42980b1fc 100755 --- a/scripts/dev/install.sh +++ b/scripts/dev/install.sh @@ -4,7 +4,11 @@ set -Eeou pipefail source scripts/funcs/printing source scripts/dev/set_env_context.sh -tools="kubectl helm coreutils kind jq shellcheck python@${PYTHON_VERSION} chart-testing" +# our version is pinned, so it removes the last patch version from it for bew +# shellcheck disable=SC2153 +python_version="${PYTHON_VERSION%.*}" + +tools="kubectl helm coreutils kind jq shellcheck python@${python_version} chart-testing" echo "The following tools will be installed using homebrew: ${tools}" echo "Note, that you must download 'go' and Docker by yourself"