From 1f26e6523ddec8ae39de07d1050c389de0879c8d Mon Sep 17 00:00:00 2001 From: Shawn <44221603+shaspitz@users.noreply.github.com> Date: Thu, 25 Sep 2025 19:22:10 -0700 Subject: [PATCH 1/7] devnet --- infrastructure/charts/Makefile | 14 ++++++++++++++ infrastructure/charts/minikube-sc.yaml | 11 +++++++++++ 2 files changed, 25 insertions(+) create mode 100644 infrastructure/charts/Makefile create mode 100644 infrastructure/charts/minikube-sc.yaml diff --git a/infrastructure/charts/Makefile b/infrastructure/charts/Makefile new file mode 100644 index 000000000..1237e5599 --- /dev/null +++ b/infrastructure/charts/Makefile @@ -0,0 +1,14 @@ +clean: + helm list --no-headers | awk '{print $$1}' | xargs helm uninstall + kubectl get pvc --no-headers | awk '{print $$1}' | xargs kubectl delete pvc + +clean-images: + docker rmi $(docker images --filter="reference=primev/primev*" -q) --force + +deploy-pg: + helm install oracle-devnet ./postgres -f postgres/values.yaml + kubectl get pods | grep oracle-devnet + +deploy-sc: + kubectl apply -f minikube-sc.yaml + kubectl get storageclass diff --git a/infrastructure/charts/minikube-sc.yaml b/infrastructure/charts/minikube-sc.yaml new file mode 100644 index 000000000..c84da9f44 --- /dev/null +++ b/infrastructure/charts/minikube-sc.yaml @@ -0,0 +1,11 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: premium-rwo + annotations: + storageclass.kubernetes.io/is-default-class: "true" + labels: + addonmanager.kubernetes.io/mode: EnsureExists +provisioner: k8s.io/minikube-hostpath +reclaimPolicy: Delete +volumeBindingMode: Immediate From 9ef582fbe21f79a94e01b44d9b6554035809b968 Mon Sep 17 00:00:00 2001 From: Shawn <44221603+shaspitz@users.noreply.github.com> Date: Thu, 25 Sep 2025 19:49:29 -0700 Subject: [PATCH 2/7] wip --- Makefile | 4 ++++ infrastructure/charts/Makefile | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2b57f3456..a69a2c708 100644 --- a/Makefile +++ b/Makefile @@ -11,3 +11,7 @@ docker: GIT_BRANCH=$(BRANCH) \ GIT_COMMIT=$(COMMIT) \ docker buildx bake $(NO_CACHE) + +build-minikube-mac: + TAG=minikube-$$(date +%Y%m%d-%H%M%S) && \ + $(MAKE) docker REGISTRY=primev REPO_NAME=primev TAG=$$TAG PLATFORM=linux/arm64 NO_CACHE=--no-cache diff --git a/infrastructure/charts/Makefile b/infrastructure/charts/Makefile index 1237e5599..d38bb4275 100644 --- a/infrastructure/charts/Makefile +++ b/infrastructure/charts/Makefile @@ -2,8 +2,11 @@ clean: helm list --no-headers | awk '{print $$1}' | xargs helm uninstall kubectl get pvc --no-headers | awk '{print $$1}' | xargs kubectl delete pvc +check-images: + docker images | grep primev + clean-images: - docker rmi $(docker images --filter="reference=primev/primev*" -q) --force + docker rmi $$(docker images --filter="reference=primev/primev*" -q) --force deploy-pg: helm install oracle-devnet ./postgres -f postgres/values.yaml From acf8bc16d28448588916f5f4b16c17220d71c99f Mon Sep 17 00:00:00 2001 From: Shawn <44221603+shaspitz@users.noreply.github.com> Date: Thu, 25 Sep 2025 20:05:15 -0700 Subject: [PATCH 3/7] wip --- Makefile | 2 +- infrastructure/charts/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a69a2c708..f4cb5db68 100644 --- a/Makefile +++ b/Makefile @@ -13,5 +13,5 @@ docker: docker buildx bake $(NO_CACHE) build-minikube-mac: - TAG=minikube-$$(date +%Y%m%d-%H%M%S) && \ + @TAG=minikube-$$(date +%Y%m%d-%H%M%S) && \ $(MAKE) docker REGISTRY=primev REPO_NAME=primev TAG=$$TAG PLATFORM=linux/arm64 NO_CACHE=--no-cache diff --git a/infrastructure/charts/Makefile b/infrastructure/charts/Makefile index d38bb4275..419d7d4ae 100644 --- a/infrastructure/charts/Makefile +++ b/infrastructure/charts/Makefile @@ -8,10 +8,10 @@ check-images: clean-images: docker rmi $$(docker images --filter="reference=primev/primev*" -q) --force -deploy-pg: - helm install oracle-devnet ./postgres -f postgres/values.yaml - kubectl get pods | grep oracle-devnet - deploy-sc: kubectl apply -f minikube-sc.yaml kubectl get storageclass + +deploy-pg: + helm install oracle-devnet ./postgres -f postgres/values.yaml + kubectl get pods | grep oracle-devnet From 1ef9b13b91de9e2b7860eb7a35f452cea3cf634e Mon Sep 17 00:00:00 2001 From: Shawn <44221603+shaspitz@users.noreply.github.com> Date: Thu, 25 Sep 2025 20:29:03 -0700 Subject: [PATCH 4/7] Update Makefile --- infrastructure/charts/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/infrastructure/charts/Makefile b/infrastructure/charts/Makefile index 419d7d4ae..45873630f 100644 --- a/infrastructure/charts/Makefile +++ b/infrastructure/charts/Makefile @@ -8,10 +8,11 @@ check-images: clean-images: docker rmi $$(docker images --filter="reference=primev/primev*" -q) --force -deploy-sc: +deploy-devnet: kubectl apply -f minikube-sc.yaml kubectl get storageclass - -deploy-pg: helm install oracle-devnet ./postgres -f postgres/values.yaml kubectl get pods | grep oracle-devnet + @BRANCH=$$(git rev-parse --abbrev-ref HEAD) && \ + echo "Deploying with branch: $$BRANCH" && \ + bash deploy.sh --branch $$BRANCH --password CXBMf4xEDO0I --local true From 0203c68d0587670899ecc63a060522f4957f5e52 Mon Sep 17 00:00:00 2001 From: Shawn <44221603+shaspitz@users.noreply.github.com> Date: Thu, 25 Sep 2025 20:47:17 -0700 Subject: [PATCH 5/7] Update Makefile --- infrastructure/charts/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/infrastructure/charts/Makefile b/infrastructure/charts/Makefile index 45873630f..318bb305c 100644 --- a/infrastructure/charts/Makefile +++ b/infrastructure/charts/Makefile @@ -1,6 +1,7 @@ clean: helm list --no-headers | awk '{print $$1}' | xargs helm uninstall kubectl get pvc --no-headers | awk '{print $$1}' | xargs kubectl delete pvc + kubectl delete storageclass premium-rwo check-images: docker images | grep primev @@ -11,6 +12,7 @@ clean-images: deploy-devnet: kubectl apply -f minikube-sc.yaml kubectl get storageclass + sleep 10 helm install oracle-devnet ./postgres -f postgres/values.yaml kubectl get pods | grep oracle-devnet @BRANCH=$$(git rev-parse --abbrev-ref HEAD) && \ From 9fe2b94fb029f67b6281679418efdb9265c78c79 Mon Sep 17 00:00:00 2001 From: Shawn <44221603+shaspitz@users.noreply.github.com> Date: Thu, 25 Sep 2025 20:53:40 -0700 Subject: [PATCH 6/7] Update Makefile --- infrastructure/charts/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/infrastructure/charts/Makefile b/infrastructure/charts/Makefile index 318bb305c..e3c5159e9 100644 --- a/infrastructure/charts/Makefile +++ b/infrastructure/charts/Makefile @@ -15,6 +15,7 @@ deploy-devnet: sleep 10 helm install oracle-devnet ./postgres -f postgres/values.yaml kubectl get pods | grep oracle-devnet + sleep 10 @BRANCH=$$(git rev-parse --abbrev-ref HEAD) && \ echo "Deploying with branch: $$BRANCH" && \ bash deploy.sh --branch $$BRANCH --password CXBMf4xEDO0I --local true From 303df11619dd5ac4f528b747b3437c9914c87d35 Mon Sep 17 00:00:00 2001 From: Shawn <44221603+shaspitz@users.noreply.github.com> Date: Thu, 25 Sep 2025 21:31:26 -0700 Subject: [PATCH 7/7] wip --- infrastructure/charts/README.md | 20 +++++++++++++++++++ .../mev-commit-erigon/templates/secret.yaml | 11 ++++++++++ .../charts/mev-commit-erigon/values.yaml | 2 +- .../charts/mev-commit-geth-l1/values.yaml | 2 +- 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 infrastructure/charts/README.md diff --git a/infrastructure/charts/README.md b/infrastructure/charts/README.md new file mode 100644 index 000000000..6ee69200e --- /dev/null +++ b/infrastructure/charts/README.md @@ -0,0 +1,20 @@ +## Local Devnet setup - MacOS + +### Steps + +*start docker* + +1. `docker system prune --all --volumes` +2. `minikube delete` +3. `minikube start --memory=8192` +4. `minikube tunnel` + +*open new window in mev-commit dir* + +1. `eval $(minikube docker-env)` +2. `make build-minikube-mac` + +*cd infrastructure/charts* + +1. `make check-images` +2. `make deploy-devnet` diff --git a/infrastructure/charts/mev-commit-erigon/templates/secret.yaml b/infrastructure/charts/mev-commit-erigon/templates/secret.yaml index f7b7f6e18..5e13d6316 100644 --- a/infrastructure/charts/mev-commit-erigon/templates/secret.yaml +++ b/infrastructure/charts/mev-commit-erigon/templates/secret.yaml @@ -23,3 +23,14 @@ type: Opaque stringData: jwt: {{ .Values.consensus.follower.jwtSecret | quote }} {{- end }} +--- +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "erigon-snode.fullname" . }}-leader-nodekey + labels: + {{- include "erigon-snode.labels" . | nindent 4 }} + app.kubernetes.io/component: leader-nodekey +type: Opaque +stringData: + nodekey: {{ .Values.erigon.nodekey | default "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" }} diff --git a/infrastructure/charts/mev-commit-erigon/values.yaml b/infrastructure/charts/mev-commit-erigon/values.yaml index c78573218..9755d1b5f 100644 --- a/infrastructure/charts/mev-commit-erigon/values.yaml +++ b/infrastructure/charts/mev-commit-erigon/values.yaml @@ -114,7 +114,7 @@ image: storage: size: 100Gi - storageClassName: openebs-nvme-disk2 + storageClassName: premium-rwo accessMode: ReadWriteOnce security: diff --git a/infrastructure/charts/mev-commit-geth-l1/values.yaml b/infrastructure/charts/mev-commit-geth-l1/values.yaml index c3fa81da3..672af61d5 100644 --- a/infrastructure/charts/mev-commit-geth-l1/values.yaml +++ b/infrastructure/charts/mev-commit-geth-l1/values.yaml @@ -74,7 +74,7 @@ funding: # Storage persistence: enabled: true - storageClass: "openebs-nvme-disk2" + storageClass: "premium-rwo" accessMode: ReadWriteOnce size: 10Gi