Skip to content

Commit

Permalink
[RND-676] Kubernetes Configuration for Meadowlark (#337)
Browse files Browse the repository at this point in the history
* [RND-676] Adding k8s files created with kompose

* Removing metadata added by kompose in postgres deployments

* Opensearch updates

* Update api labels

* Organize k8s files

* Initial k8s readme

* Restore services

* Establishing connection between meadowlark-api and postgres

* Rewrite of opensearch files for connection

* [RND-676] Adding Documentation

* Update diagram

* Rename

* Documentation updates

* Adjustments after review

* v0.4.1-pre.4

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
andonyns and github-actions[bot] authored Jan 9, 2024
1 parent 79fbd0b commit 2e54fe6
Show file tree
Hide file tree
Showing 24 changed files with 481 additions and 57 deletions.
2 changes: 1 addition & 1 deletion Meadowlark-js/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ ALLOW__EXT_PROPERTY=true
# if false, it returns an error message if the element is not part of the schema.
ALLOW_OVERPOSTING=true

SAVE_LOG_TO_FILE=false
LOG_TO_FILE=false
# LOG_FILE_LOCATION=c:/temp/
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@edfi/meadowlark-elasticsearch-backend",
"main": "dist/index.js",
"version": "0.4.1-pre.3",
"version": "0.4.1-pre.4",
"description": "Meadowlark backend plugin for elasticsearch",
"license": "Apache-2.0",
"publishConfig": {
Expand All @@ -19,8 +19,8 @@
"build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
},
"dependencies": {
"@edfi/meadowlark-core": "0.4.1-pre.3",
"@edfi/meadowlark-utilities": "0.4.1-pre.3",
"@edfi/meadowlark-core": "0.4.1-pre.4",
"@edfi/meadowlark-utilities": "0.4.1-pre.4",
"@elastic/elasticsearch": "^8.10.0",
"@elastic/transport": "^8.3.4"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@edfi/meadowlark-mongodb-backend",
"main": "dist/index.js",
"version": "0.4.1-pre.3",
"version": "0.4.1-pre.4",
"description": "Meadowlark backend plugin for MongoDB",
"license": "Apache-2.0",
"publishConfig": {
Expand All @@ -19,9 +19,9 @@
"build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
},
"dependencies": {
"@edfi/meadowlark-authz-server": "0.4.1-pre.3",
"@edfi/meadowlark-core": "0.4.1-pre.3",
"@edfi/meadowlark-utilities": "0.4.1-pre.3",
"@edfi/meadowlark-authz-server": "0.4.1-pre.4",
"@edfi/meadowlark-core": "0.4.1-pre.4",
"@edfi/meadowlark-utilities": "0.4.1-pre.4",
"async-retry": "^1.3.3",
"mongodb": "^5.9.2",
"ramda": "0.29.1"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@edfi/meadowlark-opensearch-backend",
"main": "dist/index.js",
"version": "0.4.1-pre.3",
"version": "0.4.1-pre.4",
"description": "Meadowlark backend plugin for OpenSearch",
"license": "Apache-2.0",
"publishConfig": {
Expand All @@ -19,8 +19,8 @@
"build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
},
"dependencies": {
"@edfi/meadowlark-core": "0.4.1-pre.3",
"@edfi/meadowlark-utilities": "0.4.1-pre.3",
"@edfi/meadowlark-core": "0.4.1-pre.4",
"@edfi/meadowlark-utilities": "0.4.1-pre.4",
"@opensearch-project/opensearch": "^2.4.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@edfi/meadowlark-postgresql-backend",
"main": "dist/index.js",
"version": "0.4.1-pre.3",
"version": "0.4.1-pre.4",
"description": "Meadowlark backend plugin for PostgreSQL",
"license": "Apache-2.0",
"publishConfig": {
Expand All @@ -19,9 +19,9 @@
"build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose"
},
"dependencies": {
"@edfi/meadowlark-authz-server": "0.4.1-pre.3",
"@edfi/meadowlark-core": "0.4.1-pre.3",
"@edfi/meadowlark-utilities": "0.4.1-pre.3",
"@edfi/meadowlark-authz-server": "0.4.1-pre.4",
"@edfi/meadowlark-core": "0.4.1-pre.4",
"@edfi/meadowlark-utilities": "0.4.1-pre.4",
"pg": "^8.11.3",
"pg-format": "^1.0.4",
"ramda": "0.29.1"
Expand Down
2 changes: 1 addition & 1 deletion Meadowlark-js/lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"lerna": "8.0.2",
"version": "0.4.1-pre.3",
"version": "0.4.1-pre.4",
"npmClient": "npm"
}
50 changes: 25 additions & 25 deletions Meadowlark-js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Meadowlark-js/packages/meadowlark-authz-server/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@edfi/meadowlark-authz-server",
"main": "dist/index.js",
"version": "0.4.1-pre.3",
"version": "0.4.1-pre.4",
"description": "Meadowlark authorization server",
"license": "Apache-2.0",
"publishConfig": {
Expand All @@ -14,7 +14,7 @@
],
"dependencies": {
"@apideck/better-ajv-errors": "^0.3.6",
"@edfi/meadowlark-utilities": "0.4.1-pre.3",
"@edfi/meadowlark-utilities": "0.4.1-pre.4",
"ajv": "^8.12.0",
"didyoumean2": "^6.0.1",
"dotenv": "^16.3.1",
Expand Down
4 changes: 2 additions & 2 deletions Meadowlark-js/packages/meadowlark-core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@edfi/meadowlark-core",
"main": "dist/index.js",
"version": "0.4.1-pre.3",
"version": "0.4.1-pre.4",
"description": "Meadowlark core functionality",
"license": "Apache-2.0",
"publishConfig": {
Expand All @@ -14,7 +14,7 @@
],
"dependencies": {
"@apideck/better-ajv-errors": "^0.3.6",
"@edfi/meadowlark-utilities": "0.4.1-pre.3",
"@edfi/meadowlark-utilities": "0.4.1-pre.4",
"@isaacs/ttlcache": "^1.4.1",
"ajv": "^8.12.0",
"ajv-formats": "^2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion Meadowlark-js/packages/meadowlark-utilities/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@edfi/meadowlark-utilities",
"main": "dist/index.js",
"version": "0.4.1-pre.3",
"version": "0.4.1-pre.4",
"description": "Meadowlark shared utilities",
"license": "Apache-2.0",
"publishConfig": {
Expand Down
8 changes: 4 additions & 4 deletions Meadowlark-js/services/meadowlark-fastify/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@edfi/meadowlark-fastify",
"version": "0.4.1-pre.3",
"version": "0.4.1-pre.4",
"description": "Meadowlark service using Fastify",
"license": "Apache-2.0",
"publishConfig": {
Expand All @@ -12,9 +12,9 @@
"/package.json"
],
"dependencies": {
"@edfi/meadowlark-authz-server": "0.4.1-pre.3",
"@edfi/meadowlark-core": "0.4.1-pre.3",
"@edfi/meadowlark-utilities": "0.4.1-pre.3",
"@edfi/meadowlark-authz-server": "0.4.1-pre.4",
"@edfi/meadowlark-core": "0.4.1-pre.4",
"@edfi/meadowlark-utilities": "0.4.1-pre.4",
"@fastify/rate-limit": "^6.0.1",
"dotenv": "^16.3.1",
"fastify": "^3.29.5"
Expand Down
4 changes: 2 additions & 2 deletions Meadowlark-js/tests/e2e/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@edfi/meadowlark-e2e-tests",
"main": "dist/index.js",
"version": "0.4.1-pre.3",
"version": "0.4.1-pre.4",
"description": "Meadowlark Ed-Fi API end to end tests",
"license": "Apache-2.0",
"private": true,
"files": [],
"devDependencies": {
"@edfi/meadowlark-utilities": "0.4.1-pre.3",
"@edfi/meadowlark-utilities": "0.4.1-pre.4",
"@testcontainers/mongodb": "^10.3.1",
"@testcontainers/postgresql": "^10.3.1",
"@types/chance": "^1.1.6",
Expand Down
10 changes: 5 additions & 5 deletions Meadowlark-js/tests/e2e/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ This is a special mode that will setup a group of containers in different ports
(denoted with the names -test) and will not delete the containers after each
run.

- To setup, run: `npm run test:e2e:dev:setup`. This will configure the test
* To setup, run: `npm run test:e2e:dev:setup`. This will configure the test
containers
- Set the environment variable `DEVELOPER_MODE=true`
- Run `npm run test:e2e:jest:tc` to run the tests
- Save the Admin Key and Secret (as specified in
* Set the environment variable `DEVELOPER_MODE=true`
* Run `npm run test:e2e:jest:tc` to run the tests
* Save the Admin Key and Secret (as specified in
[.env-e2e.example](./setup/.env-e2e.example)) to be able to run the tests
without cleaning the environment
- When done, run: `npm run test:e2e:dev:exit` or execute the
* When done, run: `npm run test:e2e:dev:exit` or execute the
`exit-dev-containers.ps1` script to clean the environment.

> [!NOTE]
Expand Down
Loading

0 comments on commit 2e54fe6

Please sign in to comment.