chore(bors): merge pull request #709

709: chore: make ports of services with hostNetwork configurable r=Abhinandan-Purkait a=Abhinandan-Purkait

Make ports for the services using hostNetwork configurable

Co-authored-by: Abhinandan Purkait <[email protected]>

Author: mayastor-bors

chart/README.md

@@ -88,6 +88,7 @@ This removes all the Kubernetes components associated with the chart and deletes
 | agents.​ha.​cluster.​resources.​requests.​cpu | Cpu requests for ha cluster agent | `"100m"` |
 | agents.​ha.​cluster.​resources.​requests.​memory | Memory requests for ha cluster agent | `"16Mi"` |
 | agents.​ha.​node.​logLevel | Log level for the ha node service | `"info"` |
+| agents.​ha.​node.​port | Container port for the ha-node service | `50053` |
 | agents.​ha.​node.​priorityClassName | Set PriorityClass, overrides global | `""` |
 | agents.​ha.​node.​resources.​limits.​cpu | Cpu limits for ha node agent | `"100m"` |
 | agents.​ha.​node.​resources.​limits.​memory | Memory limits for ha node agent | `"64Mi"` |
@@ -120,6 +121,7 @@ This removes all the Kubernetes components associated with the chart and deletes
 | base.​logging.​format | Valid values for format are pretty, json and compact | `"pretty"` |
 | base.​logging.​silenceLevel | Silence specific module components | `nil` |
 | base.​metrics.​enabled | Enable the metrics exporter | `true` |
+| base.​metrics.​port | Container port for the metrics exporter service | `9502` |
 | crds.​csi.​volumeSnapshots.​enabled | Install Volume Snapshot CRDs | `true` |
 | crds.​enabled | Disables the installation of all CRDs if set to false | `true` |
 | csi.​controller.​logLevel | Log level for the csi controller | `"info"` |
@@ -141,6 +143,7 @@ This removes all the Kubernetes components associated with the chart and deletes
 | csi.​image.​snapshotterTag | csi-snapshotter image release tag | `"v6.3.3"` |
 | csi.​node.​kubeletDir | The kubeletDir directory for the csi-node plugin | `"/var/lib/kubelet"` |
 | csi.​node.​nvme.​ctrl_loss_tmo | The ctrl_loss_tmo (controller loss timeout) in seconds | `"1980"` |
+| csi.​node.​port | Container port for the csi-node service | `10199` |
 | csi.​node.​priorityClassName | Set PriorityClass, overrides global | `""` |
 | csi.​node.​resources.​limits.​cpu | Cpu limits for csi node plugin | `"100m"` |
 | csi.​node.​resources.​limits.​memory | Memory limits for csi node plugin | `"128Mi"` |
@@ -176,6 +179,7 @@ This removes all the Kubernetes components associated with the chart and deletes
 | io_engine.&ZeroWidthSpace;nodeSelector | Node selectors to designate storage nodes for diskpool creation Note that if multi-arch images support 'kubernetes.io/arch: amd64' should be removed. | <pre>{<br>"kubernetes.io/arch":"amd64",<br>"openebs.io/engine":"mayastor"<br>}</pre> |
 | io_engine.&ZeroWidthSpace;nvme.&ZeroWidthSpace;ioTimeout | Timeout for IOs The default here is exaggerated for local disks, but we've observed that in shared virtual environments having a higher timeout value is beneficial. Please adjust this according to your hardware and needs. | `"110s"` |
 | io_engine.&ZeroWidthSpace;nvme.&ZeroWidthSpace;tcp.&ZeroWidthSpace;maxQueueDepth | You may need to increase this for a higher outstanding IOs per volume | `"32"` |
+| io_engine.&ZeroWidthSpace;port | Container port for the io-engine service | `10124` |
 | io_engine.&ZeroWidthSpace;priorityClassName | Set PriorityClass, overrides global | `""` |
 | io_engine.&ZeroWidthSpace;pstorRetries | Number of retries for pstor persistence before the volume target self shutdowns | `300` |
 | io_engine.&ZeroWidthSpace;resources.&ZeroWidthSpace;limits.&ZeroWidthSpace;cpu | Cpu limits for the io-engine | `""` |

chart/templates/mayastor/agents/ha/ha-node-daemonset.yaml

@@ -72,7 +72,7 @@ spec:
         args:
         - "--node-name=$(MY_NODE_NAME)"
         - "--csi-socket={{ default .Values.csi.node.pluginMountPath .Values.csi.node.pluginMounthPath }}/{{ .Values.csi.node.socketPath }}"
-        - "--grpc-endpoint=$(MY_POD_IP):50053"
+        - "--grpc-endpoint=$(MY_POD_IP):{{ default 50053 .Values.agents.ha.node.port }}"
         - "--cluster-agent=https://{{ .Release.Name }}-agent-core:50052"{{ if .Values.base.jaeger.enabled }}
         - "--jaeger={{ include "jaeger_url" . }}"{{ end }}{{ if .Values.eventing.enabled }}
         - "--events-url=nats://{{ .Release.Name }}-nats:4222"{{ end }}
@@ -95,7 +95,7 @@ spec:
             cpu: {{ .Values.agents.ha.node.resources.requests.cpu | quote }}
             memory: {{ .Values.agents.ha.node.resources.requests.memory | quote }}
         ports:
-          - containerPort: 50053
+          - containerPort: {{ default 50053 .Values.agents.ha.node.port }}
             protocol: TCP
             name: ha-node
       volumes:

chart/templates/mayastor/csi/csi-node-daemonset.yaml

@@ -91,7 +91,7 @@ spec:
         - "--rest-endpoint=http://{{ .Release.Name }}-api-rest:8081"{{ if .Values.csi.node.restClient.enabled }}
         - "--enable-rest"{{ end }}
         - "--enable-registration"
-        - "--grpc-endpoint=$(MY_POD_IP):10199"{{ if .Values.csi.node.nvme.io_timeout }}
+        - "--grpc-endpoint=$(MY_POD_IP):{{ default 10199 .Values.csi.node.port }}"{{ if .Values.csi.node.nvme.io_timeout }}
         - "--nvme-io-timeout={{ .Values.csi.node.nvme.io_timeout }}"
         - "--nvme-core-io-timeout={{ .Values.csi.node.nvme.io_timeout }}"{{ else }}
         - "--nvme-io-timeout={{ .Values.io_engine.nvme.ioTimeout }}10s"
@@ -143,7 +143,7 @@ spec:
             memory: "50Mi"
         # Mayastor node plugin gRPC server
         ports:
-        - containerPort: 10199
+        - containerPort: {{ default 10199 .Values.csi.node.port }}
           protocol: TCP
           name: mayastor-node
       volumes:

chart/templates/mayastor/io/io-engine-daemonset.yaml

@@ -54,10 +54,11 @@ spec:
             fieldRef:
               fieldPath: status.podIP
         ports:
-          - containerPort: 9502
+          - containerPort: {{ default 9502 .Values.base.metrics.port }}
             protocol: TCP
             name: metrics
         args:
+          - "--metrics-endpoint=0.0.0.0:{{ default 9502 .Values.base.metrics.port }}"
           - "--fmt-style={{ include "logFormat" . }}"
           - "--ansi-colors={{ .Values.base.logging.color }}"
       {{- end }}
@@ -98,7 +99,7 @@ spec:
         # For example -l 1,2,10-20 means use core 1, 2, 10 to 20.
         # Note: Ensure that the CPU resources are updated accordingly.
         #       If you use 2 CPUs, the CPU: field should also read 2.
-        - "-g$(MY_POD_IP)"
+        - "-g$(MY_POD_IP):{{ default 10124 .Values.io_engine.port }}"
         - "-N$(MY_NODE_NAME)"
         - "-Rhttps://{{ .Release.Name }}-agent-core:50051"
         - "-y/var/local/{{ .Release.Name }}/io-engine/config.yaml"
@@ -137,7 +138,7 @@ spec:
             memory: {{ .Values.io_engine.resources.requests.memory | quote }}
             hugepages-2Mi: {{ .Values.io_engine.resources.requests.hugepages2Mi | quote }}
         ports:
-        - containerPort: 10124
+        - containerPort: {{ default 10124 .Values.io_engine.port }}
           protocol: TCP
           name: io-engine
       volumes:

chart/values.yaml

@@ -94,6 +94,8 @@ base:
   metrics:
     # -- Enable the metrics exporter
     enabled: true
+    # -- Container port for the metrics exporter service
+    port: 9502
 
   jaeger:
     # Enable jaeger tracing (for development only).
@@ -238,6 +240,8 @@ agents:
       tolerations: []
       # -- Set PriorityClass, overrides global
       priorityClassName: ""
+      # -- Container port for the ha-node service
+      port: 50053
     cluster:
       # -- Log level for the ha cluster service
       logLevel: info
@@ -400,6 +404,8 @@ csi:
       containers:
         - name: nvme-tcp-probe
           command: ['sh', '-c', 'trap "exit 1" TERM; until $(lsmod | grep nvme_tcp &>/dev/null); do [ -z "$WARNED" ] && echo "nvme_tcp module not loaded..."; WARNED=1; sleep 60; done;']
+    # -- Container port for the csi-node service
+    port: 10199
 
 io_engine:
   # -- Log level for the io-engine service
@@ -471,6 +477,8 @@ io_engine:
   runtimeClassName: ""
   # -- Number of retries for pstor persistence before the volume target self shutdowns
   pstorRetries: 300
+  # -- Container port for the io-engine service
+  port: 10124
 
 etcd:
   # -- Disable when using an external etcd cluster.