feat: refactor, add P2P Port support

graphops · Sep 27, 2023 · 41adefe · 41adefe
1 parent 3e361f7
commit 41adefe
Show file tree

Hide file tree

Showing 20 changed files with 110 additions and 65 deletions.
diff --git a/arbitrum/helmfile.yaml b/arbitrum/helmfile.yaml
@@ -6,9 +6,10 @@
 
 
 environments:
-  default:
+  {{ .Environment.Name }}:
     values:
-    - flavor: {{ .Values.flavor }}
+      - flavor: {{ .Values.flavor }}
+
 ---
 {{- $_tplTransforms := `
 {{- $_TemplatedResources := list "Deployment" "StatefulSet" "DaemonSet" -}}

diff --git a/avalanche/helmfile.yaml b/avalanche/helmfile.yaml
@@ -6,9 +6,10 @@
 
 
 environments:
-  default:
+  {{ .Environment.Name }}:
     values:
-    - flavor: {{ .Values.flavor }}
+      - flavor: {{ .Values.flavor }}
+
 ---
 {{- $_tplTransforms := `
 {{- $_TemplatedResources := list "Deployment" "StatefulSet" "DaemonSet" -}}

diff --git a/celo/helmfile.yaml b/celo/helmfile.yaml
@@ -6,9 +6,10 @@
 
 
 environments:
-  default:
+  {{ .Environment.Name }}:
     values:
-    - flavor: {{ .Values.flavor }}
+      - flavor: {{ .Values.flavor }}
+
 ---
 {{- $_tplTransforms := `
 {{- $_TemplatedResources := list "Deployment" "StatefulSet" "DaemonSet" -}}

diff --git a/ethereum/README.md b/ethereum/README.md
@@ -109,7 +109,6 @@ helmfiles:
 | Key | Type | Default | Description |
 | :--- | :---: | :--- | :--- |
 annotations | object |  | Add annotations to releases on this namespace |
-deployments | integer | 1 | ethereum scaling |
 erigon | object |  |  |
 erigon.annotations | object |  | Add annotations to resources on this release |
 erigon.chartUrl | string |  | Override this release's chart URL (i.e: an absolute like /path/to/chart.tgz or /path/to/chart_dir. Or a remote like git::https://github.com/bitnami/charts.git@bitnami/apache?ref=main) |
@@ -135,6 +134,9 @@ proxyd.chartVersion | string |  | Specify a specific chart version to use for th
 proxyd.labels | object |  | Adds helmfile labels to this release |
 proxyd.mergeValues | boolean | true | Merges passed values with namespace's defaults if true, overrides if false |
 proxyd.values | (object *or* list of objects) |  | Pass values to the release helm chart |
+scaling | object |  | ethereum scaling interface |
+scaling.deployments | integer | 1 | number of independent stateful sets to deploy |
+scaling.startP2PPort | integer |  | A beggining port for the range to use in P2P NodePorts |
 targetNamespace | string | eth-mainnet | the default is eth-<flavor> |
 helmDefaults | object |  |  |
 helmDefaults.args | list of strings |  |  |

diff --git a/ethereum/helmfile.yaml b/ethereum/helmfile.yaml
@@ -12,16 +12,21 @@
 {{ end }}
 
 #set default number of deployments when missing
-{{ if not ( hasKey .Values "deployments" ) }}
-{{ $_ := set .Values "deployments" 1 }}
+{{ if not ( hasKey .Values  "scaling" ) }}
+{{ $_ := set .Values "scaling" dict }}
+{{ end }}
+{{ if not ( hasKey ( .Values | get "scaling" dict ) "deployments" ) }}
+{{ $_ := set .Values.scaling "deployments" 1 }}
 {{ end }}
 
 environments:
-  default:
+  {{ .Environment.Name }}:
     values:
-    - flavor: {{ .Values.flavor }}
-    - features: {{ .Values.features | toYaml | nindent 10 }}
-    - deployments: {{ .Values.deployments }}
+      - flavor: {{ .Values.flavor }}
+      - features: {{ .Values.features | toYaml | nindent 10 }}
+      - scaling:
+          deployments: {{ .Values.scaling.deployments }}
+
 ---
 {{- $_tplTransforms := `
 {{- $_TemplatedResources := list "Deployment" "StatefulSet" "DaemonSet" -}}
@@ -166,7 +171,7 @@ templates:
     {{- end }}
 releases:
   {{- $canonicalRelease := "erigon" }}
-  {{- range $index := until .Values.deployments }}
+  {{- range $index := until .Values.scaling.deployments }}
   {{- $deploymentIndex := (add . 1) }}
   {{- $release := (printf "%s%v" "erigon-" $deploymentIndex) }}
   - name: "{{ $release }}"
@@ -177,7 +182,7 @@ releases:
   {{- end -}}
   {{ if has "nimbus" ( .Values | get "features" list ) }}
   {{- $canonicalRelease := "nimbus" }}
-  {{- range $index := until .Values.deployments }}
+  {{- range $index := until .Values.scaling.deployments }}
   {{- $deploymentIndex := (add . 1) }}
   {{- $release := (printf "%s%v" "nimbus-" $deploymentIndex) }}
   - name: "{{ $release }}"

diff --git a/ethereum/values/_common/erigon.yaml → ethereum/values/_common/erigon.yaml.gotmpl b/ethereum/values/_common/erigon.yaml → ethereum/values/_common/erigon.yaml.gotmpl
@@ -1,3 +1,5 @@
+{{ $scalingIndex := splitList "-" .Release.Name | last }}
+
 statefulNode:
   jwt:
     # Generate me with: openssl rand -hex 32
@@ -12,6 +14,10 @@ statefulNode:
   volumeClaimSpec:
     # -- The storage class to use when provisioning a persistent volume for Erigon
     storageClassName: openebs-rawfile-localpv # change me if desired
+{{- if (hasKey .Values.scaling "p2pStartPort") }}
+  p2pNodePort:
+    port: {{ add (mul (sub $scalingIndex 1) 2) .Values.scaling.p2pStartPort }}
+{{- end }}
 
 rpcdaemon:
   enabled: true

diff --git a/ethereum/values/_common/nimbus.yaml.gotmpl b/ethereum/values/_common/nimbus.yaml.gotmpl
@@ -1,6 +1,6 @@
 nimbus:
-  {{ $deploymentIndex := splitList "-" .Release.Name | last }}
-  executionClientUrl: http://erigon-{{ $deploymentIndex }}-stateful-node:8551
+  {{ $scalingIndex := splitList "-" .Release.Name | last }}
+  executionClientUrl: http://erigon-{{ $scalingIndex }}-stateful-node:8551
   jwt:
     # Generate me with: openssl rand -hex 32
     # Must match EL client jwt
@@ -16,6 +16,10 @@ nimbus:
     resources:
       requests:
         storage: 300Gi
+{{- if (hasKey .Values.scaling "p2pStartPort") }}
+  p2pNodePort:
+    port: {{ add (mul (sub $scalingIndex 1) 2) .Values.scaling.p2pStartPort 1 }}
+{{- end }}
 
 prometheus:
   serviceMonitors:

diff --git a/ethereum/values/_common/proxyd.yaml.gotmpl b/ethereum/values/_common/proxyd.yaml.gotmpl
@@ -1,5 +1,5 @@
 backends:
-  {{ range $elem := until .Values.deployments }}
+  {{ range $elem := until .Values.scaling.deployments }}
   {{ $index := (add $elem 1) }}
   erigon-{{ $index }}:
     enabled: true

diff --git a/gnosis/helmfile.yaml b/gnosis/helmfile.yaml
@@ -6,9 +6,10 @@
 
 
 environments:
-  default:
+  {{ .Environment.Name }}:
     values:
-    - flavor: {{ .Values.flavor }}
+      - flavor: {{ .Values.flavor }}
+
 ---
 {{- $_tplTransforms := `
 {{- $_TemplatedResources := list "Deployment" "StatefulSet" "DaemonSet" -}}

diff --git a/graph/helmfile.yaml b/graph/helmfile.yaml
@@ -6,9 +6,10 @@
 
 
 environments:
-  default:
+  {{ .Environment.Name }}:
     values:
-    - flavor: {{ .Values.flavor }}
+      - flavor: {{ .Values.flavor }}
+
 ---
 {{- $_tplTransforms := `
 {{- $_TemplatedResources := list "Deployment" "StatefulSet" "DaemonSet" -}}

diff --git a/ingress/helmfile.yaml b/ingress/helmfile.yaml
@@ -9,9 +9,10 @@
 
 
 environments:
-  default:
+  {{ .Environment.Name }}:
     values:
-    - features: {{ .Values.features | toYaml | nindent 10 }}
+      - features: {{ .Values.features | toYaml | nindent 10 }}
+
 ---
 {{- $_tplTransforms := `
 {{- $_TemplatedResources := list "Deployment" "StatefulSet" "DaemonSet" -}}

diff --git a/monitoring/helmfile.yaml b/monitoring/helmfile.yaml
@@ -9,9 +9,10 @@
 
 
 environments:
-  default:
+  {{ .Environment.Name }}:
     values:
-    - features: {{ .Values.features | toYaml | nindent 10 }}
+      - features: {{ .Values.features | toYaml | nindent 10 }}
+
 ---
 {{- $_tplTransforms := `
 {{- $_TemplatedResources := list "Deployment" "StatefulSet" "DaemonSet" -}}

diff --git a/polygon/helmfile.yaml b/polygon/helmfile.yaml
@@ -6,9 +6,10 @@
 
 
 environments:
-  default:
+  {{ .Environment.Name }}:
     values:
-    - flavor: {{ .Values.flavor }}
+      - flavor: {{ .Values.flavor }}
+
 ---
 {{- $_tplTransforms := `
 {{- $_TemplatedResources := list "Deployment" "StatefulSet" "DaemonSet" -}}

diff --git a/postgres-operator/helmfile.yaml b/postgres-operator/helmfile.yaml
@@ -2,8 +2,8 @@
 
 
 environments:
-  default:
-    values:
+  {{ .Environment.Name }}:
+    values: []
 
 ---
 {{- $_tplTransforms := `

diff --git a/schema.json b/schema.json
@@ -1683,11 +1683,6 @@
                     }
                 }
             },
-            "namespaces.ethereum.deployments": {
-                "description": "ethereum scaling",
-                "type": "integer",
-                "default": 1
-            },
             "namespaces.ethereum.features": {
                 "description": "ethereum namespace features schema",
                 "type": "object"
@@ -1770,6 +1765,24 @@
                     }
                 ]
             },
+            "namespaces.ethereum.scaling": {
+                "description": "ethereum scaling interface",
+                "type": "object",
+                "required": [
+                    "deployments"
+                ],
+                "properties": {
+                    "deployments": {
+                        "description": "number of independent stateful sets to deploy",
+                        "type": "integer",
+                        "default": 1
+                    },
+                    "startP2PPort": {
+                        "description": "A beggining port for the range to use in P2P NodePorts",
+                        "type": "integer"
+                    }
+                }
+            },
             "namespaces.ethereum.values": {
                 "description": "ethereum namespace values schema",
                 "type": "object",
@@ -1798,8 +1811,8 @@
                     "nimbus": {
                         "$ref": "#/components/schemas/base.releaseValues"
                     },
-                    "deployments": {
-                        "$ref": "#/components/schemas/namespaces.ethereum.deployments"
+                    "scaling": {
+                        "$ref": "#/components/schemas/namespaces.ethereum.scaling"
                     },
                     "proxyd": {
                         "$ref": "#/components/schemas/base.releaseValues"

diff --git a/sealed-secrets/helmfile.yaml b/sealed-secrets/helmfile.yaml
@@ -2,8 +2,8 @@
 
 
 environments:
-  default:
-    values:
+  {{ .Environment.Name }}:
+    values: []
 
 ---
 {{- $_tplTransforms := `

diff --git a/src/schemas/base.cue b/src/schemas/base.cue
@@ -64,7 +64,7 @@ _#namespaceTemplate: {
 		targetNamespace: _key.#values.targetNamespace
 		if _key.#features != _|_ {features: [..._key.#features.#enum]}
 		if _key.#flavor != _|_ {flavor: _key.#flavor.#enum}
-		if _key.#deployments != _|_ {deployments: _key.#deployments}
+		if _key.#scaling != _|_ {scaling: deployments: _key.#scaling.deployments}
 		for rkey, _ in _key.releases {
 			(rkey): {
 				mergeValues: _key.#values.#releaseValues.mergeValues

diff --git a/src/schemas/build_tool.cue b/src/schemas/build_tool.cue
@@ -56,8 +56,8 @@ _helmfile: {
 		_defaultFeatures: _helmfile._#defaultFeatures & {_namespace: this}
 		defaultFeatures:  _defaultFeatures.out
 
-		_defaultDeployments: _helmfile._#defaultDeployments & {_namespace: this}
-		defaultDeployments:  _defaultDeployments.out
+		_defaultScaling: _helmfile._#defaultScaling & {_namespace: this}
+		defaultScaling:  _defaultScaling.out
 
 		_environment: _helmfile._#environment & {_namespace: this}
 		environment:  _environment.out
@@ -80,7 +80,7 @@ _helmfile: {
 		out: strings.Join([
 			defaultFlavor,
 			defaultFeatures,
-			defaultDeployments,
+			defaultScaling,
 			environment,
 			"---",
 			_templateBlocks.transforms,
@@ -171,14 +171,17 @@ _helmfile: {
 		}
 	}
 
-	_#defaultDeployments: {
+	_#defaultScaling: {
 		this=_namespace: string
 		out:             *"" | string
-		if _namespaces[this].values.deployments != _|_ {
+		if _namespaces[this].values.scaling != _|_ {
 			out: """
 				#set default number of deployments when missing
-				{{ if not ( hasKey .Values \"deployments\" ) }}
-				{{ $_ := set .Values \"deployments\" \(_namespaces[this].values.deployments) }}
+				{{ if not ( hasKey .Values  "scaling" ) }}
+				{{ $_ := set .Values \"scaling\" dict }}
+				{{ end }}
+				{{ if not ( hasKey ( .Values | get "scaling" dict ) \"deployments\" ) }}
+				{{ $_ := set .Values.scaling \"deployments\" \(_namespaces[this].values.scaling.deployments) }}
 				{{ end }}
 
 				"""
@@ -190,23 +193,21 @@ _helmfile: {
 
 		_variables: {
 			if _namespaces[this].values.flavor != _|_ {
-				flavor: '{{ .Values.flavor }}'
+				flavor: "{{ .Values.flavor }}"
 			}
 			if _namespaces[this].values.features != _|_ {
-				features: '{{ .Values.features | toYaml | nindent 10 }}'
+				features: "{{ .Values.features | toYaml | nindent 10 }}"
 			}
-			if _namespaces[this].values.deployments != _|_ {
-				deployments: "{{ .Values.deployments }}"
+			if _namespaces[this].values.scaling != _|_ {
+				scaling: deployments: "{{ .Values.scaling.deployments }}"
 			}
 		}
 
-		_variableStrings: strings.Join([ for key, value in _variables {"    - \(key): \(value)"}], "\n")
-		out:              """
-			environments:
-			  default:
-			    values:
-			\(_variableStrings)
-			"""
+		_yaml:       yaml.Marshal({environments: "{{ .Environment.Name }}": values: [ for key, value in _variables {(key): value}]})
+		_yamlCleanP: strings.Replace(_yaml, "'{{", "{{", -1)
+		_yamlCleanS: strings.Replace(_yamlCleanP, "}}'", "}}", -1)
+		_yamlClean:  _yamlCleanS
+		out:         _yamlClean
 	}
 
 	_#defaultNamespace: {
@@ -337,7 +338,7 @@ _helmfile: {
 			if scale {
 				header: """
 				{{- $canonicalRelease := "\(this)" }}
-				{{- range $index := until .Values.deployments }}
+				{{- range $index := until .Values.scaling.deployments }}
 				{{- $deploymentIndex := (add . 1) }}
 				{{- $release := (printf "%s%v" "\(this)-" $deploymentIndex) }}
 				"""
@@ -368,7 +369,7 @@ _helmfile: {
 				...
 				_release: releaseName
 			}}}
-			if _namespaces[this].values.deployments != _|_ {if release._scale {
+			if _namespaces[this].values.scaling.deployments != _|_ {if release._scale {
 				_props: {"\(releaseName)": {#properties: {
 					...
 					_scale: true