diff --git a/bin/k8s-configmap b/bin/k8s-configmap index 32c6801a3a..dd18581186 100755 --- a/bin/k8s-configmap +++ b/bin/k8s-configmap @@ -4,7 +4,7 @@ #. .setup_env prod -kubectl create configmap $ZKSYNC_ENV-configmap --namespace $ZKSYNC_ENV --dry-run -o yaml +kubectl create configmap configmap --namespace $ZKSYNC_ENV --dry-run -o yaml echo data: while read -r line; do VAR=`sed 's/=.*//' <<< $line` diff --git a/bin/prover b/bin/prover index ae7900c50a..1bd74a6437 100755 --- a/bin/prover +++ b/bin/prover @@ -7,7 +7,7 @@ NUM_OF_PROVERS=${1:-1} pids=( ) # initialize an empty array to store PIDs for n in `eval echo {1..$NUM_OF_PROVERS}`; do - PROVER_BASE_NAME="$POD_NAME"_"$n"_blocks_ + PROVER_BASE_NAME="$HOST_NAME"_"$n"_blocks_ cargo run --release --bin plonk_step_by_step_prover $PROVER_BASE_NAME > /dev/null & pid="$!" pids+=( "$pid" ) echo "prover $PROVER_BASE_NAME with pid $pid" diff --git a/core/models/src/config_options.rs b/core/models/src/config_options.rs index 8725a957a1..914778e290 100644 --- a/core/models/src/config_options.rs +++ b/core/models/src/config_options.rs @@ -106,7 +106,6 @@ impl ProverOptions { #[derive(Debug, Clone)] pub struct ConfigurationOptions { - pub replica_name: String, pub rest_api_server_address: SocketAddr, pub json_rpc_http_server_address: SocketAddr, pub json_rpc_ws_server_address: SocketAddr, @@ -136,7 +135,6 @@ impl ConfigurationOptions { let mut available_block_chunk_sizes = block_chunk_sizes().to_vec(); available_block_chunk_sizes.sort(); Self { - replica_name: parse_env("SERVER_REPLICA_NAME"), rest_api_server_address: parse_env("REST_API_BIND"), json_rpc_http_server_address: parse_env("HTTP_RPC_API_BIND"), json_rpc_ws_server_address: parse_env("WS_API_BIND"), diff --git a/docker/prover/Dockerfile b/docker/prover/Dockerfile index f04b1a2737..d0e4383c56 100644 --- a/docker/prover/Dockerfile +++ b/docker/prover/Dockerfile @@ -2,8 +2,6 @@ FROM alpine # Docs of env variables used for this image # to test this locally just run # docker build -t tmp_prover -f =(f envsubst < ./docker/prover/Dockerfile) .; docker run --rm tmp_prover:latest -#ENV NODE_NAME nodename -#ENV POD_NAME podname #ENV SUPPORTED_BLOCK_CHUNKS_SIZES $SUPPORTED_BLOCK_CHUNKS_SIZES #ENV SUPPORTED_BLOCK_CHUNKS_SIZES_SETUP_POWERS $SUPPORTED_BLOCK_CHUNKS_SIZES_SETUP_POWERS #ENV BLOCK_CHUNK_SIZES $BLOCK_CHUNK_SIZES diff --git a/docker/prover/prover-entry.sh b/docker/prover/prover-entry.sh index 5191d1ba99..2af41467db 100755 --- a/docker/prover/prover-entry.sh +++ b/docker/prover/prover-entry.sh @@ -3,7 +3,7 @@ export ZKSYNC_HOME="/" echo NODE_NAME=$NODE_NAME -echo POD_NAME=$POD_NAME +echo PROVER_NAME=`hostname` echo SUPPORTED_BLOCK_CHUNKS_SIZES=$SUPPORTED_BLOCK_CHUNKS_SIZES echo SUPPORTED_BLOCK_CHUNKS_SIZES_SETUP_POWERS=$SUPPORTED_BLOCK_CHUNKS_SIZES_SETUP_POWERS @@ -12,7 +12,7 @@ echo BLOCK_CHUNK_SIZES=$BLOCK_CHUNK_SIZES if [ "$DOCKER_DUMMY_PROVER" == "true" ]; then echo "Starting dummy_prover" - exec dummy_prover "$POD_NAME" 2>&1 + exec dummy_prover "$PROVER_NAME" 2>&1 fi # we download only keys used in node (defined by $BLOCK_CHUNK_SIZES) @@ -28,4 +28,4 @@ fi echo key download complete, starting prover -exec plonk_step_by_step_prover "$POD_NAME" 2>&1 +exec plonk_step_by_step_prover "$PROVER_NAME" 2>&1 diff --git a/etc/env/dev.env.example b/etc/env/dev.env.example index 547bb83111..f92a545b47 100755 --- a/etc/env/dev.env.example +++ b/etc/env/dev.env.example @@ -126,8 +126,6 @@ RUST_LOG=storage=info,server=debug,prover=debug,plasma=info,eth_client=info,data # Server container kubernetes resoruces. SERVER_CONTAINER_RESOURCES="{\"requests\": {\"cpu\": 2, \"memory\": \"500Mi\"}}" -POD_NAME=default-prover-pod-name - IMAGE_TAG=$(lasthash=$(git rev-parse HEAD) && echo ${lasthash:0:8}) ZKSYNC_ACTION=dont_ask @@ -136,5 +134,3 @@ CONFIRMATIONS_FOR_ETH_EVENT=0 # poll interval milliseconds ETH_WATCH_POLL_INTERVAL=300 - -SERVER_REPLICA_NAME=server-1 diff --git a/etc/kube/ingress.yaml b/etc/kube/ingress.yaml index a1264de049..5470c2104b 100644 --- a/etc/kube/ingress.yaml +++ b/etc/kube/ingress.yaml @@ -20,21 +20,21 @@ spec: paths: - path: / backend: - serviceName: ${ZKSYNC_ENV}-server + serviceName: server servicePort: 3000 - path: /jsrpc backend: - serviceName: ${ZKSYNC_ENV}-server + serviceName: server servicePort: 3030 - path: /jsrpc-ws backend: - serviceName: ${ZKSYNC_ENV}-server + serviceName: server servicePort: 3031 - host: ${EXPLORER_HOST} http: paths: - path: / backend: - serviceName: ${ZKSYNC_ENV}-nginx + serviceName: nginx servicePort: 80 diff --git a/etc/kube/nginx.yaml b/etc/kube/nginx.yaml index d8bb93aa67..68fb858fb6 100644 --- a/etc/kube/nginx.yaml +++ b/etc/kube/nginx.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: ${ZKSYNC_ENV}-nginx + name: nginx namespace: ${ZKSYNC_ENV} labels: - app: ${ZKSYNC_ENV}-nginx + app: nginx spec: type: ClusterIP ports: @@ -13,25 +13,25 @@ spec: protocol: TCP name: http selector: - app: ${ZKSYNC_ENV}-nginx + app: nginx --- apiVersion: apps/v1 kind: Deployment metadata: - name: ${ZKSYNC_ENV}-nginx + name: nginx namespace: ${ZKSYNC_ENV} spec: replicas: 1 selector: matchLabels: - app: ${ZKSYNC_ENV}-nginx + app: nginx template: metadata: labels: - app: ${ZKSYNC_ENV}-nginx + app: nginx spec: containers: - - name: ${ZKSYNC_ENV}-nginx + - name: nginx image: matterlabs/nginx:${IMAGE_TAG} imagePullPolicy: Always ports: diff --git a/etc/kube/prover.yaml b/etc/kube/prover.yaml index cfa33c147d..2104cd59a3 100644 --- a/etc/kube/prover.yaml +++ b/etc/kube/prover.yaml @@ -1,37 +1,28 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: ${ZKSYNC_ENV}-prover + name: prover namespace: ${ZKSYNC_ENV} labels: - app: ${ZKSYNC_ENV}-prover + app: prover spec: strategy: type: Recreate replicas: 1 selector: matchLabels: - app: ${ZKSYNC_ENV}-prover + app: prover template: metadata: labels: - app: ${ZKSYNC_ENV}-prover + app: prover spec: containers: - - name: ${ZKSYNC_ENV}-prover + - name: prover image: matterlabs/prover:${IMAGE_TAG} imagePullPolicy: Always resources: ${PROVER_MIN_RESOURCES} envFrom: - configMapRef: - name: ${ZKSYNC_ENV}-configmap - env: - - name: NODE_NAME - valueFrom: - fieldRef: - fieldPath: spec.nodeName - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name + name: configmap terminationGracePeriodSeconds: 20 diff --git a/etc/kube/server.yaml b/etc/kube/server.yaml index 596049a30a..9bc69b157b 100644 --- a/etc/kube/server.yaml +++ b/etc/kube/server.yaml @@ -1,38 +1,38 @@ apiVersion: v1 kind: Service metadata: - name: ${ZKSYNC_ENV}-server + name: server namespace: ${ZKSYNC_ENV} annotations: qoqo.dev/service-mode: active-standby labels: - app: ${ZKSYNC_ENV}-server + app: server spec: type: ClusterIP ports: - port: 3000 targetPort: 3000 protocol: TCP - name: ${ZKSYNC_ENV}-server-rest + name: server-rest - port: 3030 targetPort: 3030 protocol: TCP - name: ${ZKSYNC_ENV}-server-jsrpc + name: server-jsrpc - port: 3031 targetPort: 3031 protocol: TCP - name: ${ZKSYNC_ENV}-server-jsrpc-ws + name: server-jsrpc-ws - port: 8088 targetPort: 8088 protocol: TCP - name: ${ZKSYNC_ENV}-prover-server-port + name: prover-server-port selector: - app: ${ZKSYNC_ENV}-server + app: server --- apiVersion: apps/v1 kind: Deployment metadata: - name: ${ZKSYNC_ENV}-server + name: server namespace: ${ZKSYNC_ENV} spec: strategy: @@ -40,11 +40,11 @@ spec: replicas: 2 selector: matchLabels: - app: ${ZKSYNC_ENV}-server + app: server template: metadata: labels: - app: ${ZKSYNC_ENV}-server + app: server spec: containers: - name: server @@ -58,15 +58,10 @@ spec: - containerPort: 8088 envFrom: - configMapRef: - name: ${ZKSYNC_ENV}-configmap + name: configmap env: - name: ZKSYNC_ENV value: "${ZKSYNC_ENV}" - - name: SERVER_REPLICA_NAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.name - name: OPERATOR_PRIVATE_KEY valueFrom: secretKeyRef: