fix: wggateway template ports when metrics not enabled

liqotech · Jan 31, 2025 · d03e24a · d03e24a
1 parent 95890f0
commit d03e24a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/deployments/liqo/templates/liqo-wireguard-gateway-client-template.yaml b/deployments/liqo/templates/liqo-wireguard-gateway-client-template.yaml
@@ -74,8 +74,8 @@ spec:
                 volumeMounts: 
                 - name: ipc 
                   mountPath: /ipc
-                {{- if .Values.metrics.enabled }}
                 ports:
+                {{- if .Values.metrics.enabled }}
                 - containerPort: 8082
                   name: gw-metrics
                 {{- end }}
@@ -120,8 +120,8 @@ spec:
                 {{- end }}
                 - --health-probe-bind-address=:8085
                 - --implementation={{ .Values.networking.gatewayTemplates.wireguard.implementation }}
-                {{- if .Values.metrics.enabled }}
                 ports:
+                {{- if .Values.metrics.enabled }}
                 - containerPort: 8084
                   name: wg-metrics
                 {{- end }}
@@ -166,8 +166,8 @@ spec:
                 volumeMounts: 
                 - name: ipc 
                   mountPath: /ipc
-                {{- if .Values.metrics.enabled }}
                 ports:
+                {{- if .Values.metrics.enabled }}
                 - containerPort: 8086
                   name: gv-metrics
                 {{- end }} 

diff --git a/deployments/liqo/templates/liqo-wireguard-gateway-server-template-eks.yaml b/deployments/liqo/templates/liqo-wireguard-gateway-server-template-eks.yaml
@@ -101,12 +101,11 @@ spec:
                 volumeMounts: 
                 - name: ipc 
                   mountPath: /ipc
-                {{- if .Values.metrics.enabled }}
                 ports:
+                {{- if .Values.metrics.enabled }}
                 - containerPort: 8082
                   name: gw-metrics
                 {{- end }}
-                ports:
                 - containerPort: 8083
                   name: healthz
                 # ATTENTION: uncomment the readinessProbe section if you are aware of the consequences.
@@ -147,12 +146,11 @@ spec:
                 {{- end }}
                 - --health-probe-bind-address=:8085
                 - --implementation={{ .Values.networking.gatewayTemplates.wireguard.implementation }}
-                {{- if .Values.metrics.enabled }}
                 ports:
+                {{- if .Values.metrics.enabled }}
                 - containerPort: 8084
                   name: wg-metrics
                 {{- end }}
-                ports:
                 - containerPort: 8085
                   name: healthz
                 # ATTENTION: uncomment the readinessProbe section if you are aware of the consequences.
@@ -194,12 +192,11 @@ spec:
                 volumeMounts: 
                 - name: ipc 
                   mountPath: /ipc
-                {{- if .Values.metrics.enabled }}
                 ports:
+                {{- if .Values.metrics.enabled }}
                 - containerPort: 8086
                   name: gv-metrics
                 {{- end }}
-                ports:
                 - containerPort: 8087
                   name: healthz
                 # ATTENTION: uncomment the readinessProbe section if you are aware of the consequences.

diff --git a/deployments/liqo/templates/liqo-wireguard-gateway-server-template.yaml b/deployments/liqo/templates/liqo-wireguard-gateway-server-template.yaml
@@ -94,8 +94,8 @@ spec:
                 volumeMounts:
                 - name: ipc
                   mountPath: /ipc
-                {{- if .Values.metrics.enabled }}
                 ports:
+                {{- if .Values.metrics.enabled }}
                 - containerPort: 8082
                   name: gw-metrics
                 {{- end }}
@@ -139,8 +139,8 @@ spec:
                 {{- end }}
                 - --health-probe-bind-address=:8085
                 - --implementation={{ .Values.networking.gatewayTemplates.wireguard.implementation }}
-                {{- if .Values.metrics.enabled }}
                 ports:
+                {{- if .Values.metrics.enabled }}
                 - containerPort: 8084
                   name: wg-metrics
                 {{- end }}
@@ -185,8 +185,8 @@ spec:
                 volumeMounts:
                 - name: ipc
                   mountPath: /ipc
-                {{- if .Values.metrics.enabled }}
                 ports:
+                {{- if .Values.metrics.enabled }}
                 - containerPort: 8086
                   name: gv-metrics
                 {{- end }}