Merge pull request #5731 from emissary-ingress/will-h-helm-chart-update

Add Helm Chart Support for Opt-In Support for Exposing Port 8878 in the AdminService
emissary-ingress · Aug 9, 2024 · 3ab7632 · 3ab7632
2 parents 680e3dc + 778869f
commit 3ab7632
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/charts/emissary-ingress/templates/admin-service.yaml b/charts/emissary-ingress/templates/admin-service.yaml
@@ -32,6 +32,12 @@ spec:
       {{- if (and (eq .Values.adminService.type "NodePort") (not (empty .Values.adminService.nodePort))) }}
       nodePort: {{ int .Values.adminService.nodePort }}
       {{- end }}
+      {{- if .Values.adminService.goPluginMetricsPort}}
+    - port: {{ .Values.adminService.goPluginMetricsPort }}
+      targetPort: 8878
+      protocol: TCP
+      name: go-plugin-filter-metrics
+      {{- end }}
     - port: {{ .Values.adminService.snapshotPort }}
       targetPort: 8005
       protocol: TCP

diff --git a/charts/emissary-ingress/templates/deployment.yaml b/charts/emissary-ingress/templates/deployment.yaml
@@ -215,11 +215,19 @@ spec:
             {{- end}}
             - name: admin
               containerPort: {{ .Values.adminService.port }}
+            {{- if .Values.adminService.goPluginMetricsPort}}
+            - name: go-plugin-metrics-port
+              containerPort: {{ .Values.adminService.goPluginMetricsPort}}
+            {{- end}}
           env:
             - name: HOST_IP
               valueFrom:
                 fieldRef:
                   fieldPath: status.hostIP
+            {{- if .Values.adminService.goPluginMetricsPort}}
+            - name: ENABLE_PLUGIN_FILTER_METRICS
+              value: "true"
+            {{- end }}
             {{- if .Values.prometheusExporter.enabled }}
             - name: STATSD_ENABLED
               value: "true"

diff --git a/charts/emissary-ingress/values.yaml.in b/charts/emissary-ingress/values.yaml.in
@@ -208,6 +208,7 @@ adminService:
   type: ClusterIP
   port: 8877
   snapshotPort: 8005
+  goPluginMetricsPort: 
   # If explicit NodePort for admin service is required
   nodePort:
   # Annotations to apply to Ambassador admin service