diff --git a/content/tutorials/compute-to-data.md b/content/tutorials/compute-to-data.md index 93b621d0..0b660177 100644 --- a/content/tutorials/compute-to-data.md +++ b/content/tutorials/compute-to-data.md @@ -20,20 +20,16 @@ Then you need the following parts: - a working Kubernetes (K8s) cluster (Minikube is a good start) - a working `kubectl` connected to the K8s cluster - one folder (/ocean/operator-service/), in which we will download the following: - - [postgres-configmap.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/develop/deploy_on_k8s/postgres-configmap.yaml) - - [postgres-storage.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/develop/deploy_on_k8s/postgres-storage.yaml) - - [postgres-deployment.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/develop/deploy_on_k8s/postgres-deployment.yaml) - - [postgres-service.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/develop/deploy_on_k8s/postgresql-service.yaml) - - [deployment.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/develop/deploy_on_k8s/deployment.yaml) - - [role_binding.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/develop/deploy_on_k8s/role_binding.yaml) - - [service_account.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/develop/deploy_on_k8s/service_account.yaml) + - [postgres-configmap.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/main/kubernetes/postgres-configmap.yaml) + - [postgres-storage.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/main/kubernetes/postgres-storage.yaml) + - [postgres-deployment.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/main/kubernetes/postgres-deployment.yaml) + - [postgres-service.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/main/kubernetes/postgresql-service.yaml) + - [deployment.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-service/main/kubernetes/deployment.yaml) - one folder (/ocean/operator-engine/), in which we will download the following: - - [sa.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-engine/develop/k8s_install/sa.yml) - - [binding.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-engine/develop/k8s_install/binding.yml) - - [operator.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-engine/develop/k8s_install/operator.yml) - - [computejob-crd.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-engine/develop/k8s_install/computejob-crd.yaml) - - [workflow-crd.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-engine/develop/k8s_install/workflow-crd.yaml) - + - [sa.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-engine/main/kubernetes/sa.yml) + - [binding.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-engine/main/kubernetes/binding.yml) + - [operator.yaml](https://raw.githubusercontent.com/oceanprotocol/operator-engine/main/kubernetes/operator.yml) + ## Customize your Operator Service deployment The following resources need attention: @@ -45,15 +41,7 @@ The following resources need attention: ## Customize your Operator Engine deployment -The following resources need attention: - -| Resource | Variable | Description | -| --------------- | ------------------------------------------------------ | ------------------------------------------------------------------------------------------- | -| `operator.yaml` | `ACCOUNT_JSON`, `ACCOUNT_PASSWORD` | Defines the account that is going to be used when publishing results back to OceanProtocol. | -| | `AWS_ACCESS_KEY_ID`, `AWS_ACCESS_KEY_ID`, `AWS_REGION` | S3 credentials for the logs and output buckets. | -| | `AWS_BUCKET_OUTPUT` | Bucket that will hold the output data (algorithm logs & algorithm output). | -| | `AWS_BUCKET_ADMINLOGS` | Bucket that will hold the admin logs (logs from pod-configure & pod-publish). | -| | `STORAGE_CLASS` | Storage class to use (see next section). | +Check the [README](https://github.com/oceanprotocol/operator-engine#customize-your-operator-engine-deployment) section of operator engine to customize your deployment ## Storage class @@ -112,8 +100,6 @@ kubectl create -f /ocean/operator-service/postgres-storage.yaml kubectl create -f /ocean/operator-service/postgres-deployment.yaml kubectl create -f /ocean/operator-service/postgresql-service.yaml kubectl apply -f /ocean/operator-service/deployment.yaml -kubectl apply -f /ocean/operator-service/role_binding.yaml -kubectl apply -f /ocean/operator-service/service_account.yaml ``` ## Deploy Operator Engine @@ -123,8 +109,6 @@ kubectl config set-context --current --namespace ocean-compute kubectl apply -f /ocean/operator-engine/sa.yml kubectl apply -f /ocean/operator-engine/binding.yml kubectl apply -f /ocean/operator-engine/operator.yml -kubectl apply -f /ocean/operator-engine/computejob-crd.yaml -kubectl apply -f /ocean/operator-engine/workflow-crd.yaml kubectl create -f /ocean/operator-service/postgres-configmap.yaml ``` @@ -148,12 +132,12 @@ If your cluster is running on example.com: curl -X POST "http://example.com:8050/api/v1/operator/pgsqlinit" -H "accept: application/json" ``` -## Update Brizo +## Update Barge for local testing -Update Brizo by adding or updating the `OPERATOR_SERVICE_URL` env in `/ocean/barge/compose-files/brizo.yaml` +Update Barge's Provider by adding or updating the `OPERATOR_SERVICE_URL` env in `/ocean/barge/compose-files/provider.yaml` ```yaml OPERATOR_SERVICE_URL: http://example.com:8050/ ``` -Restart Barge with updated Brizo configuration +Restart Barge with updated provider configuration diff --git a/content/tutorials/wallets-and-ocean-tokens.md b/content/tutorials/wallets-and-ocean-tokens.md index a2a4861d..0d90d5f0 100644 --- a/content/tutorials/wallets-and-ocean-tokens.md +++ b/content/tutorials/wallets-and-ocean-tokens.md @@ -27,6 +27,12 @@ Almost all ERC-20 wallets require these values for adding a custom token: - Symbol: `OCEAN` - Decimals: `18` +**Polygon Mainnet (previously Matic)** + +- Contract Address: `0x282d8efCe846A88B159800bd4130ad77443Fa1A1` +- Symbol: `mOCEAN` +- Decimals: `18` + The [OCEAN Token page](https://oceanprotocol.com/token) at oceanprotocol.com has further details. ## MetaMask diff --git a/package-lock.json b/package-lock.json index bedf3970..a0990240 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15481,9 +15481,9 @@ "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" }, "husky": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/husky/-/husky-5.2.0.tgz", - "integrity": "sha512-AM8T/auHXRBxlrfPVLKP6jt49GCM2Zz47m8G3FOMsLmTv8Dj/fKVWE0Rh2d4Qrvmy131xEsdQnb3OXRib67PGg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz", + "integrity": "sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==", "dev": true }, "iconv-lite": { diff --git a/package.json b/package.json index ce9c74ae..c1720bfe 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "@oceanprotocol/art": "^3.0.0", "axios": "^0.21.1", - "classnames": "^2.2.6", + "classnames": "^2.3.1", "gatsby": "^2.32.12", "gatsby-image": "^3.3.0", "gatsby-plugin-catch-links": "^2.10.0", @@ -39,7 +39,7 @@ "gatsby-remark-images": "^3.11.1", "gatsby-remark-responsive-iframe": "^2.11.0", "gatsby-remark-smartypants": "^2.10.0", - "gatsby-remark-vscode": "^3.2.0", + "gatsby-remark-vscode": "^3.2.1", "gatsby-source-filesystem": "^2.11.1", "gatsby-source-graphql": "^2.14.0", "gatsby-transformer-remark": "^2.16.1", @@ -57,7 +57,7 @@ "remark-github-plugin": "^1.4.0", "remark-react": "^8.0.0", "shortid": "^2.2.16", - "slugify": "^1.4.7", + "slugify": "^1.5.0", "smoothscroll-polyfill": "^0.4.4", "swagger-client": "^3.13.2" }, @@ -66,10 +66,10 @@ "dotenv": "^8.2.0", "eslint": "^7.24.0", "eslint-config-oceanprotocol": "^1.5.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-prettier": "^3.3.1", + "eslint-config-prettier": "^8.2.0", + "eslint-plugin-prettier": "^3.4.0", "git-format-staged": "^2.1.1", - "husky": "^5.1.3", + "husky": "^6.0.0", "markdownlint-cli": "^0.27.1", "node-sass": "^5.0.0", "npm-run-all": "^4.1.5",