diff --git a/kubernetes/Makefile b/kubernetes/Makefile index d1df7fde..1193d463 100644 --- a/kubernetes/Makefile +++ b/kubernetes/Makefile @@ -6,7 +6,6 @@ CLUSTER_SCRIPTS := \ build/services/conductor.yml \ build/services/conductor-worker.yml \ build/services/nginx-storage.yml \ - build/services/geth.yml \ build/services/rabbitmq.yml \ build/services/signing-service.yml \ build/services/verifier.yml \ diff --git a/kubernetes/create-services.sh.j2 b/kubernetes/create-services.sh.j2 index c1457e51..a67aa5e5 100755 --- a/kubernetes/create-services.sh.j2 +++ b/kubernetes/create-services.sh.j2 @@ -4,9 +4,6 @@ kubectl create --record --filename services/verifier.yml ./wait-until-ready.sh verifier 70 -{% if concent_versions[concent_version].external_geth_address is none %} -kubectl create --record --filename services/geth.yml -{% endif %} kubectl create --record --filename services/rabbitmq.yml {% if allow_signing_service_authentication %} kubectl create --record --filename services/middleman.yml @@ -35,6 +32,3 @@ kubectl create --record --filename services/nginx-proxy.yml ./wait-until-ready.sh conductor-worker 30 ./wait-until-ready.sh nginx-storage 30 ./wait-until-ready.sh nginx-proxy 30 -{% if concent_versions[concent_version].external_geth_address is none %} -./wait-until-ready.sh geth 80 -{% endif %} diff --git a/kubernetes/delete-services.sh b/kubernetes/delete-services.sh index 162b58ad..ace1c19c 100755 --- a/kubernetes/delete-services.sh +++ b/kubernetes/delete-services.sh @@ -12,6 +12,5 @@ kubectl delete --filename services/concent-api.yml || true kubectl delete --filename services/middleman.yml || true kubectl delete --filename services/signing-service.yml || true kubectl delete --filename services/rabbitmq.yml || true -kubectl delete --filename services/geth.yml || true ./delete-config-maps.sh || true diff --git a/kubernetes/services/geth.yml.j2 b/kubernetes/services/geth.yml.j2 deleted file mode 100644 index f82c7b66..00000000 --- a/kubernetes/services/geth.yml.j2 +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: geth -spec: - replicas: 1 - revisionHistoryLimit: 1 - template: - metadata: - labels: - run: geth - spec: - containers: - - name: geth - image: ethereum/client-go:{{ geth_version }} - imagePullPolicy: Always - args: [ - "--rinkeby", - "--datadir", "/blockchain/.ethereum/rinkeby/", - "--syncmode", "fast", - # SYNC: Make sure to give the container enough RAM to fit the cache. - # Also remember that geth needs significantly more memory than just cache so don't set it to the same value. - "--cache", "512", - "--rpc", - "--rpcaddr", "0.0.0.0", - "--rpcvhosts", "geth, geth.default, geth.default.svc.cluster.local", - # These APIs are used by golem smart contract interface. - # First one is for basic methods with use json, second one is for basic methods with use javascript for example to connect to geth RPC, - # third one is used to check network status for example peer count - "--rpcapi", "eth, web3, net", - "--ipcdisable" - ] - livenessProbe: - httpGet: - path: / - port: 8545 - httpHeaders: - - name: Content-Type - value: application/json - initialDelaySeconds: 5 - periodSeconds: 8 - resources: - requests: - # SYNC: Make sure that the memory limits for the pod include the cache size defined above. - memory: "{{ resource_limits.others.geth.memory.requests }}" - cpu: "{{ resource_limits.others.geth.cpu.requests }}" - limits: - memory: "{{ resource_limits.others.geth.memory.limits }}" - cpu: "{{ resource_limits.others.geth.cpu.limits }}" - volumeMounts: - - mountPath: /blockchain - name: geth-storage - volumes: - - name: geth-storage - gcePersistentDisk: - pdName: {{ concent_versions[concent_version].geth_disk }} - fsType: ext4 ---- -apiVersion: v1 -kind: Service -metadata: - name: geth - labels: - run: geth -spec: - type: ClusterIP - ports: - - port: 8545 - targetPort: 8545 - name: geth-rpc-port - selector: - run: geth