Merge pull request #56 from web3labs/clean-up

Refine k8s scripts and descriptors

Author: zkValidator44

k8s/README.md

@@ -29,9 +29,10 @@ minikube addons enable ingress
 ```
 
 ```
-'''
 minikube service sirato-proxy
-'''
+```
+
+```
 ❯ minikube service sirato-proxy
 |-----------|--------------|-------------|---------------------------|
 | NAMESPACE |     NAME     | TARGET PORT |            URL            |
@@ -46,6 +47,7 @@ minikube service sirato-proxy
 |-----------|--------------|-------------|------------------------|
 🎉  Opening service default/sirato-proxy in default browser...
 ```
+
 Point your browser to the provided URL.
 
 ## Stopping Sirato

k8s/api-deployment.yml.tmpl renamed to k8s/api.yml

@@ -25,7 +25,7 @@ spec:
         - name: MONGO_CREATE_INDICES
           value: "true"
         - name: NODE_ENDPOINT
-          value: NODEENDPOINT
+          value: {{NODE_ENDPOINT}}
         - name: REINDEX_ENDPOINT
           value: http://sirato-ingestion/reindex
 ---

k8s/ingestion-deployment.yml.tmpl renamed to k8s/ingestion.yml

@@ -22,7 +22,7 @@ spec:
             - name: MONGO_DB_NAME
               value: epirus
             - name: NODE_ENDPOINT
-              value: NODEENDPOINT
+              value: {{NODE_ENDPOINT}}
           image: web3labs/epirus-free-ingestion:latest
           name: ingestion
           resources: {}

k8s/mongodb-deployment.yml.tmpl renamed to k8s/mongodb.yml

@@ -5,25 +5,11 @@ metadata:
 data:
   nginx.conf: |
     user nginx;
-    worker_processes  3;
     error_log  /var/log/nginx/error.log;
     events {
-      worker_connections  10240;
     }
     http {
-      log_format  main
-              'remote_addr:$remote_addr\t'
-              'time_local:$time_local\t'
-              'method:$request_method\t'
-              'uri:$request_uri\t'
-              'host:$host\t'
-              'status:$status\t'
-              'bytes_sent:$body_bytes_sent\t'
-              'referer:$http_referer\t'
-              'useragent:$http_user_agent\t'
-              'forwardedfor:$http_x_forwarded_for\t'
-              'request_time:$request_time';
-      access_log	/var/log/nginx/access.log main;
+      access_log	/var/log/nginx/access.log;
       server {
           listen       80;
           server_name  _;
@@ -74,7 +60,6 @@ spec:
         emptyDir: {}
       restartPolicy: Always
 ---
----
 apiVersion: v1
 kind: Service
 metadata:

k8s/proxy.yml.tmpl renamed to k8s/proxy.yml

@@ -1,24 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -eu
 
-echo ---------------- Deleting Epirus-mogodb PoD and Service ----------------
-kubectl delete -f mongodb-deployment.yml
-
-echo ---------------- Deleting Epirus-web PoD and Service ----------------
-kubectl delete -f web-deployment.yml
-
-echo ---------------- Deleting Epirus-api PoD and Service ----------------
-kubectl delete -f api-deployment.yml
-
-echo ---------------- Deleting Epirus-ingestion PoD ----------------
-kubectl delete -f ingestion-deployment.yml
-
-echo ---------------- Deleting Proxy PoD ----------------
-kubectl delete -f proxy.yml
-
-echo ---------------- Deleting vmbc-sirato Namespace ----------------
+kubectl delete --all deployments -n sirato-explorer
+kubectl delete --all services -n sirato-explorer
 kubectl delete namespace sirato-explorer
-
-echo ---------------- Removing tmp files ----------------
-rm -rvf mongodb-deployment.yml web-deployment.yml api-deployment.yml ingestion-deployment.yml proxy.yml 
-
-echo ========================== DONE ===========================

k8s/sirato-destroy.sh

@@ -1,32 +1,26 @@
 #!/usr/bin/env bash
-set -e
+set -eu
 
-endpoint=""
+NAMESPACE="sirato-explorer"
+ENDPOINT=""
 
 if [ $# -eq 1 ]; then
   echo "Using endpoint: $1"
-  endpoint=$1
+  ENDPOINT=$1
 else
-  echo "Please specify a node endpoint"
+  echo "Usage: $0 <RPC_URL>"
+  echo "Example: $0 https://your.evm.net:8545/"
   exit 1
 fi
 
-NAMESPACE="sirato-explorer"
-
-kubectl create namespace ${NAMESPACE}
+kubectl create namespace $NAMESPACE
 
-cp api-deployment.yml.tmpl api-deployment.yml
-cp ingestion-deployment.yml.tmpl ingestion-deployment.yml
-cp mongodb-deployment.yml.tmpl mongodb-deployment.yml
-cp web-deployment.yml.tmpl web-deployment.yml
-cp proxy.yml.tmpl proxy.yml
+kubectl create -n $NAMESPACE -f mongodb.yml
+sed "s|{{NODE_ENDPOINT}}|$ENDPOINT|g" ingestion.yml | kubectl create -n $NAMESPACE -f -
+sed "s|{{NODE_ENDPOINT}}|$ENDPOINT|g" api.yml | kubectl create -n $NAMESPACE -f -
+kubectl create -n $NAMESPACE -f web.yml,proxy.yml
 
-if [ "$ARCH" == "Darwin" ]; then
-  sed -i '' "s|NODEENDPOINT|$endpoint|g" "ingestion-deployment.yml"
-  sed -i '' "s|NODEENDPOINT|$endpoint|g" "api-deployment.yml"
-else
-  sed -i "s|NODEENDPOINT|$endpoint|g" "ingestion-deployment.yml"
-  sed -i "s|NODEENDPOINT|$endpoint|g" "api-deployment.yml"
-fi
+kubectl get pods -n $NAMESPACE
+kubectl get svc -n $NAMESPACE
 
-kubectl create -f mongodb-deployment.yml,api-deployment.yml,ingestion-deployment.yml,web-deployment.yml,proxy.yml
+echo -e "\n🎉 If you are in Minikube you can run 'minikube service sirato-proxy -n ${NAMESPACE}' to get an ingress URL"