From dd88e3de258b88ad8cc61e3a4fc3f522f0cc3ae1 Mon Sep 17 00:00:00 2001
From: Mitch <mitchell@aztecprotocol.com>
Date: Wed, 21 Aug 2024 09:31:17 -0400
Subject: [PATCH] fix: remove prover start option. template ports

---
 .../aztec-network/templates/boot-node.stateful-set.yaml    | 6 +++---
 .../aztec-network/templates/validator.stateful-set.yaml    | 2 +-
 yarn-project/Earthfile                                     | 7 +------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/helm-charts/aztec-network/templates/boot-node.stateful-set.yaml b/helm-charts/aztec-network/templates/boot-node.stateful-set.yaml
index 875e2354154..d3132d3a9e9 100644
--- a/helm-charts/aztec-network/templates/boot-node.stateful-set.yaml
+++ b/helm-charts/aztec-network/templates/boot-node.stateful-set.yaml
@@ -54,7 +54,7 @@ spec:
             [
               "/bin/bash",
               "-c",
-              "source /shared/contracts.env && env && node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js start --node p2pEnabled=true --archiver --sequencer --prover --pxe",
+              "source /shared/contracts.env && env && node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js start --node --archiver --sequencer",
             ]
           volumeMounts:
             - name: shared-volume
@@ -91,8 +91,8 @@ spec:
             - name: VALIDATOR_PRIVATE_KEY
               value: "0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a"
           ports:
-            - containerPort: 8080
-            - containerPort: 40400
+            - containerPort: "{{ .Values.bootNode.service.nodePort }}"
+            - containerPort: "{{ .Values.bootNode.service.p2pPort }}"
           resources:
             {{- toYaml .Values.bootNode.resources | nindent 12 }}
       volumes:
diff --git a/helm-charts/aztec-network/templates/validator.stateful-set.yaml b/helm-charts/aztec-network/templates/validator.stateful-set.yaml
index 4a3281d55d5..577d47a3c6e 100644
--- a/helm-charts/aztec-network/templates/validator.stateful-set.yaml
+++ b/helm-charts/aztec-network/templates/validator.stateful-set.yaml
@@ -40,7 +40,7 @@ spec:
           command:
             - "/bin/bash"
             - "-c"
-            - "source /shared/contracts.env && env && node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js start --node --archiver --sequencer --prover"
+            - "source /shared/contracts.env && env && node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js start --node --archiver --sequencer"
           volumeMounts:
             - name: shared-volume
               mountPath: /shared
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index 82e19d58bdf..3d5f3864c43 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -206,12 +206,7 @@ end-to-end-base:
         && apt-get install -y wget gnupg \
         && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
         && echo "deb [arch=$(dpkg --print-architecture)] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
-        && wget -O kubectl "https://dl.k8s.io/release/$(wget -qO- https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
-        && chmod +x kubectl && mv kubectl /usr/local/bin/kubectl \
-        && wget -O ./kind https://kind.sigs.k8s.io/dl/v0.23.0/kind-$(uname)-amd64 \
-        && chmod +x ./kind && mv ./kind /usr/local/bin/kind \
-        && wget -O - https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash \
-        && apt update && apt install wget chromium nodejs netcat-openbsd -y \
+        && apt update && apt install curl chromium nodejs netcat-openbsd -y \
         && rm -rf /var/lib/apt/lists/*
     ENV CHROME_BIN="/usr/bin/chromium"
     ENV PATH=/opt/foundry/bin:$PATH