Removed NodePort support, we currently don't use it.

starkware-libs · Jul 9, 2024 · 7592d40 · 7592d40
1 parent f1a1c19
commit 7592d40
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/deployments/helm/templates/deployment.yaml b/deployments/helm/templates/deployment.yaml
@@ -93,7 +93,6 @@ spec:
           - --{{ $key }}
           {{- end }}
           {{ end }}
-        {{- if .Values.service }}
         ports:
         {{- if .Values.service.ports.rpc.enabled }}
         - containerPort: {{ .Values.service.ports.rpc.port }}
@@ -107,7 +106,6 @@ spec:
         - containerPort: {{ default 10000 .Values.p2p.config.networkTcpPort }}
           name: p2p
         {{- end }}
-        {{- end }}
         volumeMounts:
         - name: data
           mountPath: /app/data

diff --git a/deployments/helm/templates/p2p-service.yaml b/deployments/helm/templates/p2p-service.yaml
@@ -1,4 +1,4 @@
-{{- if and ( not .Values.backup.enabled ) .Values.p2p.enabled }}
+{{- if and ( not .Values.backup.enabled ) .Values.p2p.service.enabled }}
 ---
 apiVersion: v1
 kind: Service
@@ -15,10 +15,4 @@ spec:
     port: {{ .Values.p2p.service.port }}
     protocol: {{ .Values.p2p.service.protocol }}
     targetPort: p2p
-<<<<<<< HEAD
-=======
-    {{- if and (eq .Values.p2p.service.type "NodePort") .Values.p2p.service.nodePort }}
-    nodePort: {{ .Values.p2p.service.nodePort }}
-    {{- end }}
->>>>>>> 009ca93a3c6613c4331390333df158fc31ed809d
 {{- end }}
diff --git a/deployments/helm/templates/service.yaml b/deployments/helm/templates/service.yaml
@@ -16,9 +16,6 @@ spec:
     port: {{ .Values.service.ports.rpc.port }}
     protocol: {{ .Values.service.ports.rpc.protocol }}
     targetPort: rpc
-    {{- if and (eq .Values.service.type "NodePort") .Values.service.ports.rpc.nodePort }}
-    nodePort: {{ .Values.service.ports.rpc.nodePort }}
-    {{- end }}
   {{- end }}
   {{- if and .Values.service.ports.monitoring .Values.service.ports.monitoring.enabled }}
   - name: monitoring

diff --git a/deployments/helm/values.yaml b/deployments/helm/values.yaml
@@ -32,13 +32,14 @@ p2p:
     bootstrapServer:
       # Mandatory - The network.#is_none flag on the bootsrap server
       multiaddrIsNone: 
-      # Mandatory - The bootstrap server to connect to, ip adress
+      # Mandatory - The bootstrap server ip address. If service is used, use the service address. If not, use the pod address.
       multiaddrIp:
       # Mandatory - The bootstrap server to connect to, port 
       multiaddrPort:
       # Mandatory - The bootstrap server to connect to, uid
       multiaddrUid:
   service:
+    enabled: false
     type: ClusterIP
     port: 10000
     protocol: TCP
@@ -75,7 +76,7 @@ deployment:
     #   value: BAR
   extraArgs: {} # Optional additional deployment args
     # foo: "bar"
-  extraConfig
+
 # Service variables for a papyrus pod.
 service:
   # Specify service type, supported options are ClusterIP, LoadBalancer