Fixed local IPFS node configuration and updated to v0.22.0;

InternetOfPeers · Aug 24, 2023 · a9f797c · a9f797c
1 parent b567f3d
commit a9f797c
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -171,7 +171,7 @@ To let the Multi-environment transition happen in a transparent way the `GUARDIA
 
 
    ```
-   IPFS_NODE_ADDRESS="..." # Default IPFS_NODE_ADDRESS="http://localhost:5002"
+   IPFS_NODE_ADDRESS="..." # Default IPFS_NODE_ADDRESS="http://localhost:5001"
    IPFS_PUBLIC_GATEWAY='...' # Default IPFS_PUBLIC_GATEWAY='https://localhost:8080/ipfs/${cid}'
    IPFS_PROVIDER="local"
    ```

diff --git a/configs/.env.develop.guardian.system b/configs/.env.develop.guardian.system
@@ -65,7 +65,7 @@ IPFS_TIMEOUT="720"
 IPFS_PROVIDER="web3storage" # 'web3storage' or 'local'
 IPFS_PUBLIC_GATEWAY='https://ipfs.io/ipfs/${cid}'
 IPFS_STORAGE_API_KEY="..."
-IPFS_NODE_ADDRESS="http://ipfs-node:5002"
+IPFS_NODE_ADDRESS="http://ipfs-node:5001"
 
 #BATCH_NFT_MINT_SIZE=10
 # FE/DEMO

diff --git a/configs/.env.template.guardian.system b/configs/.env.template.guardian.system
@@ -82,7 +82,7 @@ IPFS_TIMEOUT="720"
 IPFS_PROVIDER="web3storage" # 'web3storage' or 'local'
 IPFS_PUBLIC_GATEWAY='https://ipfs.io/ipfs/${cid}'
 IPFS_STORAGE_API_KEY="..."
-IPFS_NODE_ADDRESS="http://ipfs-node:5002"
+IPFS_NODE_ADDRESS="http://ipfs-node:5001"
 #BATCH_NFT_MINT_SIZE=10
 
 # FE/DEMO

diff --git a/docker-compose-DEV-ONLYSERVERS.yml b/docker-compose-DEV-ONLYSERVERS.yml
@@ -20,18 +20,15 @@ services:
     depends_on:
       - mongo
 
-  # ipfs-node:
-  #   image: ipfs/kubo:v0.18.1
-  #   ports:
-  #     - "5001:5001"
-  #     - "5002:5002"
-  #     - "4001:4001"
-  #     - "4002:4002"
-  #     - "8080:8080"
-  #     - "8081:8081"
-  #   volumes:
-  #     - ./runtime-data/ipfs/staging:/export:rw
-  #     - ./runtime-data/ipfs/data:/data/ipfs:rw
+#   ipfs-node:
+#     image: ipfs/kubo:v0.22.0
+#     ports:
+#       - "5001:5001"
+#       - "4001:4001"
+#       - "8080:8080"
+#     volumes:
+#       - ./runtime-data/ipfs/staging:/export:rw
+#       - ./runtime-data/ipfs/data:/data/ipfs:rw
 
 
   message-broker:

diff --git a/docker-compose-aws.yml b/docker-compose-aws.yml
@@ -19,14 +19,14 @@ services:
       - mongo
 
   ipfs-node:
-    image: ipfs/kubo:v0.17.0
+    image: ipfs/kubo:v0.22.0
     ports:
       - "5001:5001"
-      - "5002:5002"
       - "4001:4001"
-      - "4002:4002"
       - "8080:8080"
-      - "8081:8081"
+    volumes:
+      - ./runtime-data/ipfs/staging:/export:rw
+      - ./runtime-data/ipfs/data:/data/ipfs:rw
 
   message-broker:
     image: nats:2.9.8

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -9,17 +9,14 @@ services:
         ports:
             - 27017:27017
     ipfs-node:
-        image: ipfs/kubo:v0.18.1
+        image: ipfs/kubo:v0.22.0
         ports:
-            - "5001:5001"
-            - "5002:5002"
-            - "4001:4001"
-            - "4002:4002"
-            - "8080:8080"
-            - "8081:8081"
+        - "5001:5001"
+        - "4001:4001"
+        - "8080:8080"
         volumes:
-            - ./runtime-data/ipfs/staging:/export:rw
-            - ./runtime-data/ipfs/data:/data/ipfs:rw
+        - ./runtime-data/ipfs/staging:/export:rw
+        - ./runtime-data/ipfs/data:/data/ipfs:rw
     message-broker:
         image: nats:2.9.8
         expose:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,14 +19,14 @@ services:
       - mongo
 
   ipfs-node:
-    image: ipfs/kubo:v0.18.1
+    image: ipfs/kubo:v0.22.0
     ports:
       - "5001:5001"
-      - "5002:5002"
       - "4001:4001"
-      - "4002:4002"
       - "8080:8080"
-      - "8081:8081"
+    volumes:
+      - ./runtime-data/ipfs/staging:/export:rw
+      - ./runtime-data/ipfs/data:/data/ipfs:rw
 
   message-broker:
     image: nats:2.9.8

diff --git a/docker-composeRIL.yml b/docker-composeRIL.yml
@@ -21,14 +21,11 @@ services:
       - mongo
 
   ipfs-node:
-    image: ipfs/kubo:v0.18.1
+    image: ipfs/kubo:v0.22.0
     ports:
       - "5001:5001"
-      - "5002:5002"
       - "4001:4001"
-      - "4002:4002"
       - "8080:8080"
-      - "8081:8081"
     volumes:
       - ./runtime-data/ipfs/staging:/export:rw
       - ./runtime-data/ipfs/data:/data/ipfs:rw

diff --git a/docker-compose_SSV.yml b/docker-compose_SSV.yml
@@ -19,14 +19,11 @@ services:
       - mongo
 
   ipfs-node:
-    image: ipfs/kubo:v0.18.1
+    image: ipfs/kubo:v0.22.0
     ports:
       - "5001:5001"
-      - "5002:5002"
       - "4001:4001"
-      - "4002:4002"
       - "8080:8080"
-      - "8081:8081"
     volumes:
       - ./runtime-data/ipfs/staging:/export:rw
       - ./runtime-data/ipfs/data:/data/ipfs:rw

diff --git a/docs/environments/Ecosystem-Environment.md b/docs/environments/Ecosystem-Environment.md
@@ -62,7 +62,7 @@ IPFS_PROVIDER="web3storage" # 'web3storage' or 'local'
 #Single quote IPFS_PUBLIC_GATEWAY
 IPFS_PUBLIC_GATEWAY='https://ipfs.io/ipfs/${cid}'
 IPFS_STORAGE_API_KEY="..."
-IPFS_NODE_ADDRESS="http://ipfs-node:5002"
+IPFS_NODE_ADDRESS="http://ipfs-node:5001"
 ```
 
 ## 1) Docker Compose Configuration
@@ -254,4 +254,4 @@ Follow the steps:
         $ docker compose up -d
 ```
 
-In this configuration using the default OVERRIDING=false in the .env.\<GUARDIAN_ENV\>.guardian.system grant that the environments that are in each ./\<service\>/configs remain unloaded.
+In this configuration using the default OVERRIDING=false in the .env.\<GUARDIAN_ENV\>.guardian.system grant that the environments that are in each ./\<service\>/configs remain unloaded.
diff --git a/docs/guardian-in-production/independent-packaged-deployment.md b/docs/guardian-in-production/independent-packaged-deployment.md
@@ -27,7 +27,7 @@ Furthermore, the services are grouped into external and internal ones. External
 * &#x20; mongo:6.0.3
 * &#x20; mongo-express:1.0.0-alpha.4
   * &#x20; mongo
-* &#x20; ipfs/kubo:v0.18.1
+* &#x20; ipfs/kubo:v0.22.0
 * &#x20; message-broker:2.9.8
 * &#x20; vault:1.12.2
 

diff --git a/docs/guardian/readme/environments/ecosystem-environments.md b/docs/guardian/readme/environments/ecosystem-environments.md
@@ -213,7 +213,7 @@ IPFS_PROVIDER="web3storage" # 'web3storage' or 'local'
 #Single quote IPFS_PUBLIC_GATEWAY
 IPFS_PUBLIC_GATEWAY='https://ipfs.io/ipfs/${cid}'
 IPFS_STORAGE_API_KEY="..."
-IPFS_NODE_ADDRESS="http://ipfs-node:5002"
+IPFS_NODE_ADDRESS="http://ipfs-node:5001"
 ```
 
 ### 4) To use the docker-compose configuration and overriding specific service

diff --git a/...etting-started/installation/building-from-source-and-run-using-docker/README.md b/...etting-started/installation/building-from-source-and-run-using-docker/README.md
@@ -134,15 +134,15 @@ To let the Multi-environment transition happen in a transparent way the `GUARDIA
 
 
 ```
-IPFS_NODE_ADDRESS="..." # Default IPFS_NODE_ADDRESS="http://localhost:5002"
+IPFS_NODE_ADDRESS="..." # Default IPFS_NODE_ADDRESS="http://localhost:5001"
 IPFS_PUBLIC_GATEWAY='...' # Default IPFS_PUBLIC_GATEWAY='https://localhost:8080/ipfs/${cid}'
 IPFS_PROVIDER="local"
 ```
 
 {% hint style="info" %}
 Note:
 
-1. Default IPFS\_NODE\_ADDRESS="[http://localhost:5002](http://localhost:5002/)"
+1. Default IPFS\_NODE\_ADDRESS="[http://localhost:5001](http://localhost:5001/)"
 2. Default IPFS\_PUBLIC\_GATEWAY="[https://localhost:8080/ipfs/${cid}](https://localhost:8080/ipfs/$%7Bcid%7D)"
 {% endhint %}
 

diff --git a/k8s-manifests/1-config/worker-service-configmap.yaml b/k8s-manifests/1-config/worker-service-configmap.yaml
@@ -23,7 +23,7 @@ data:
     IPFS_PROVIDER="web3storage" # 'web3storage' or 'local'
     IPFS_PUBLIC_GATEWAY='https://ipfs.io/ipfs/${cid}'
     IPFS_STORAGE_API_KEY="..."
-    IPFS_NODE_ADDRESS="http://localhost:5002"
+    IPFS_NODE_ADDRESS="http://localhost:5001"
     MAX_HEDERA_TIMEOUT="600"
     MQ_MAX_PAYLOAD="1048576"
     #LOG_LEVEL="2"

diff --git a/k8s-manifests/2-service/ipfs-node-service.yaml b/k8s-manifests/2-service/ipfs-node-service.yaml
@@ -12,21 +12,12 @@ spec:
     - name: "5001"
       port: 5001
       targetPort: 5001
-    - name: "5002"
-      port: 5002
-      targetPort: 5002
     - name: "4001"
       port: 4001
       targetPort: 4001
-    - name: "4002"
-      port: 4002
-      targetPort: 4002
     - name: "8080"
       port: 8080
       targetPort: 8080
-    - name: "8081"
-      port: 8081
-      targetPort: 8081
   selector:
     io.kompose.service: ipfs-node
 status:

diff --git a/k8s-manifests/3-controller/ipfs-node-statefulset.yaml b/k8s-manifests/3-controller/ipfs-node-statefulset.yaml
@@ -24,11 +24,8 @@ spec:
           name: ipfs-node
           ports:
             - containerPort: 5001
-            - containerPort: 5002
             - containerPort: 4001
-            - containerPort: 4002
             - containerPort: 8080
-            - containerPort: 8081
           resources: {}
       restartPolicy: Always
   updateStrategy: {}

diff --git a/worker-service/configs/.env.worker b/worker-service/configs/.env.worker
@@ -18,7 +18,7 @@ IPFS_TIMEOUT="720"
 IPFS_PROVIDER="web3storage" # 'web3storage' or 'local'
 IPFS_PUBLIC_GATEWAY='https://ipfs.eth.aragon.network/ipfs/${cid}'
 IPFS_STORAGE_API_KEY="..."
-IPFS_NODE_ADDRESS="http://localhost:5002"
+IPFS_NODE_ADDRESS="http://localhost:5001"
 MAX_HEDERA_TIMEOUT="600"
 MQ_MAX_PAYLOAD="1048576"
 #LOG_LEVEL="2"

diff --git a/worker-service/configs/.env.worker.develop b/worker-service/configs/.env.worker.develop
@@ -18,7 +18,7 @@ IPFS_TIMEOUT="720"
 IPFS_PROVIDER="web3storage" # 'web3storage' or 'local'
 IPFS_PUBLIC_GATEWAY='https://w3s.link/ipfs/${cid}'
 IPFS_STORAGE_API_KEY="..."
-IPFS_NODE_ADDRESS="http://localhost:5002"
+IPFS_NODE_ADDRESS="http://localhost:5001"
 MAX_HEDERA_TIMEOUT="600"
 MQ_MAX_PAYLOAD="1048576"
 #LOG_LEVEL="2"

diff --git a/worker-service/configs/.env.worker.template b/worker-service/configs/.env.worker.template
@@ -18,7 +18,7 @@ IPFS_TIMEOUT="720"
 IPFS_PROVIDER="web3storage" # 'web3storage' or 'local'
 IPFS_PUBLIC_GATEWAY='https://ipfs.io/ipfs/${cid}'
 IPFS_STORAGE_API_KEY="..."
-IPFS_NODE_ADDRESS="http://localhost:5002"
+IPFS_NODE_ADDRESS="http://localhost:5001"
 MAX_HEDERA_TIMEOUT=""
 MQ_MAX_PAYLOAD=""
 #LOG_LEVEL="2"