Merge pull request #192 from forselli-stratio/expose-metrics-port

Expose metrics port when prometheus zone plugin is enabled
pinax-network · Feb 17, 2023 · 24f8c2d · 24f8c2d
2 parents 4c52574 + feae9b5
commit 24f8c2d
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 33 deletions.
diff --git a/charts/k8s-gateway-2.0.2.tgz b/charts/k8s-gateway-2.0.2.tgz
diff --git a/charts/k8s-gateway/Chart.yaml b/charts/k8s-gateway/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: k8s-gateway
 description: A Helm chart for the k8s_gateway CoreDNS plugin
 type: application
-version: 2.0.1
+version: 2.0.2
 appVersion: 0.3.3
 maintainers:
   - email: mmkashin@gmail.com

diff --git a/charts/k8s-gateway/templates/deployment.yaml b/charts/k8s-gateway/templates/deployment.yaml
@@ -32,7 +32,16 @@ spec:
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
         ports:
-        - {containerPort: 1053, protocol: UDP, name: dns-udp}
+        - containerPort: 1053
+          name: dns-udp
+          protocol: UDP
+        {{- range .Values.extraZonePlugins | uniq }}
+        {{- if eq .name "prometheus" -}}
+        - containerPort: {{ .parameters | regexFind "[^\\:]*$" }}
+          name: metrics
+          protocol: TCP
+        {{- end }}
+        {{ end }}
         livenessProbe:
           httpGet:
             path: /health

diff --git a/index.yaml b/index.yaml
@@ -3,7 +3,20 @@ entries:
   k8s-gateway:
   - apiVersion: v2
     appVersion: 0.3.3
-    created: "2023-01-25T13:16:37.2554671Z"
+    created: "2023-02-08T13:43:25.923981205+01:00"
+    description: A Helm chart for the k8s_gateway CoreDNS plugin
+    digest: b941f63f09fc65855967eb890ba556075df9d42c04fc21b18836c0011a5a8229
+    maintainers:
+    - email: mmkashin@gmail.com
+      name: Michael
+    name: k8s-gateway
+    type: application
+    urls:
+    - https://ori-edge.github.io/k8s_gateway/charts/k8s-gateway-2.0.2.tgz
+    version: 2.0.2
+  - apiVersion: v2
+    appVersion: 0.3.3
+    created: "2023-02-08T13:43:25.923581705+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: b96df1c4198087fa34f293ca0ad2d4372d2066a31c26fea981e3fe4f4a8abfea
     maintainers:
@@ -16,7 +29,7 @@ entries:
     version: 2.0.1
   - apiVersion: v2
     appVersion: 0.3.2
-    created: "2023-01-25T13:16:37.2550611Z"
+    created: "2023-02-08T13:43:25.923208407+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 44008b4017ffb7230022c6228921c097f85313f629f6684bfd0136e70db0ff41
     maintainers:
@@ -29,7 +42,7 @@ entries:
     version: 2.0.0
   - apiVersion: v2
     appVersion: 0.3.2
-    created: "2023-01-25T13:16:37.2500242Z"
+    created: "2023-02-08T13:43:25.9195137+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: cc88bce8cd2e40d8c65ba50cb48e13aafc2f6e2abe582ee055c935635b8b594a
     maintainers:
@@ -42,7 +55,7 @@ entries:
     version: 1.1.15
   - apiVersion: v2
     appVersion: 0.3.2
-    created: "2023-01-25T13:16:37.2495405Z"
+    created: "2023-02-08T13:43:25.919099014+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: fd02dc1f1642fe6f3a48b9c0982b253c4c373910f962c76448f3efac6b30f31c
     maintainers:
@@ -55,7 +68,7 @@ entries:
     version: 1.1.14
   - apiVersion: v2
     appVersion: 0.3.1
-    created: "2023-01-25T13:16:37.2489743Z"
+    created: "2023-02-08T13:43:25.918675322+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: ceea643a6515e4a7caa473a54cdfff55a5ad02f4520392eecf22767c94ac7402
     maintainers:
@@ -68,7 +81,7 @@ entries:
     version: 1.1.13
   - apiVersion: v2
     appVersion: 0.3.1
-    created: "2023-01-25T13:16:37.248383Z"
+    created: "2023-02-08T13:43:25.918212465+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 56090b3f30d6d8a9b7ebfeed1a58bc058266794dc41160018342ff32a620a706
     maintainers:
@@ -81,7 +94,7 @@ entries:
     version: 1.1.12
   - apiVersion: v2
     appVersion: 0.3.1
-    created: "2023-01-25T13:16:37.2479475Z"
+    created: "2023-02-08T13:43:25.917666327+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: ccab0ddbe46efbfd92de6317d2643e2bf25a55db1c5dfd7b73cff943c07c0aa5
     maintainers:
@@ -94,7 +107,7 @@ entries:
     version: 1.1.11
   - apiVersion: v2
     appVersion: 0.3.1
-    created: "2023-01-25T13:16:37.2475726Z"
+    created: "2023-02-08T13:43:25.917227689+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 62d07bba3428f6a68274d77906f490763bbbeafbd270befbd02c4754601f3239
     maintainers:
@@ -107,7 +120,7 @@ entries:
     version: 1.1.10
   - apiVersion: v2
     appVersion: 0.3.0
-    created: "2023-01-25T13:16:37.2541599Z"
+    created: "2023-02-08T13:43:25.922817617+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 336534b4748dd88c9d4e829d9a8527696b5369e4814c3e18c202f12198e7ba97
     maintainers:
@@ -120,7 +133,7 @@ entries:
     version: 1.1.9
   - apiVersion: v2
     appVersion: 0.3.0
-    created: "2023-01-25T13:16:37.2537082Z"
+    created: "2023-02-08T13:43:25.922489314+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: a856c5b4f473790627848bc472393ade5f9771b66b2dd660d19312763bdfd4a5
     maintainers:
@@ -133,7 +146,7 @@ entries:
     version: 1.1.8
   - apiVersion: v2
     appVersion: 0.3.0
-    created: "2023-01-25T13:16:37.251908Z"
+    created: "2023-02-08T13:43:25.922147058+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 5fc39d5e8ad2f64545e747e82d1a097115f1b95fc76405791351c653ef3f1fde
     maintainers:
@@ -146,7 +159,7 @@ entries:
     version: 1.1.7
   - apiVersion: v2
     appVersion: 0.2.4
-    created: "2023-01-25T13:16:37.2514498Z"
+    created: "2023-02-08T13:43:25.921791333+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: f66d0497f55b9dda1bc8145de86f6a1042476482b6849ba05fa019c66bdb8fd2
     maintainers:
@@ -159,7 +172,7 @@ entries:
     version: 1.1.6
   - apiVersion: v2
     appVersion: 0.2.3
-    created: "2023-01-25T13:16:37.2510662Z"
+    created: "2023-02-08T13:43:25.921453425+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 3be4dd3ee183c4cec91bd0a40c08b7114ebc5a3a8153621a7432af11592ddb29
     maintainers:
@@ -172,7 +185,7 @@ entries:
     version: 1.1.5
   - apiVersion: v2
     appVersion: 0.2.2
-    created: "2023-01-25T13:16:37.2507167Z"
+    created: "2023-02-08T13:43:25.920992107+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 9889676767632d7634236e79338fd6877a37d1dc7a56e9f32cb00b1b78589814
     maintainers:
@@ -185,7 +198,7 @@ entries:
     version: 1.1.4
   - apiVersion: v2
     appVersion: 0.2.2
-    created: "2023-01-25T13:16:37.2503388Z"
+    created: "2023-02-08T13:43:25.919891239+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: b82cc1cd106db91b03ce9249176a3b8c58ffa70ed83f4bab907910a041e04620
     maintainers:
@@ -198,7 +211,7 @@ entries:
     version: 1.1.2
   - apiVersion: v2
     appVersion: 0.2.1
-    created: "2023-01-25T13:16:37.2471586Z"
+    created: "2023-02-08T13:43:25.916876427+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: a6946aa35fed1b67ab968d282cc0cbbbb3136c6781563df7496b78e6e88ca8e1
     maintainers:
@@ -211,7 +224,7 @@ entries:
     version: 1.1.1
   - apiVersion: v2
     appVersion: 0.2.0
-    created: "2023-01-25T13:16:37.2468016Z"
+    created: "2023-02-08T13:43:25.916562556+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 74abb009602b062b805dbd96fb07cbd4c725e8dee7cd980bab0149fba1030c3a
     maintainers:
@@ -224,7 +237,7 @@ entries:
     version: 1.1.0
   - apiVersion: v2
     appVersion: 0.1.8
-    created: "2023-01-25T13:16:37.2413793Z"
+    created: "2023-02-08T13:43:25.913907004+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: df847a43e164794eb49a0d4d2d81657dd4043524862f369ae995b2b70ecbb105
     maintainers:
@@ -237,7 +250,7 @@ entries:
     version: 1.0.12
   - apiVersion: v2
     appVersion: 0.1.8
-    created: "2023-01-25T13:16:37.2409991Z"
+    created: "2023-02-08T13:43:25.913567864+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 2d1fe6ac3011d03642a77ddaa3cbe9cc7a99f19226f33f4ae18ca0d413155c0e
     maintainers:
@@ -250,7 +263,7 @@ entries:
     version: 1.0.11
   - apiVersion: v2
     appVersion: 0.1.8
-    created: "2023-01-25T13:16:37.2402164Z"
+    created: "2023-02-08T13:43:25.91320057+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 796c8f7636ef4f33c43afb0ef947817ba4caa1ace29de3d903ee2fc831fd3edf
     maintainers:
@@ -263,7 +276,7 @@ entries:
     version: 1.0.10
   - apiVersion: v2
     appVersion: 0.1.8
-    created: "2023-01-25T13:16:37.2464512Z"
+    created: "2023-02-08T13:43:25.916261084+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 8d194587b8f31ed6230b2b2fcb2215f3f52e0be1a8ff754007b5a94731b7bcfb
     maintainers:
@@ -276,7 +289,7 @@ entries:
     version: 1.0.9
   - apiVersion: v2
     appVersion: 0.1.8
-    created: "2023-01-25T13:16:37.2460078Z"
+    created: "2023-02-08T13:43:25.915970946+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 8edd4edd05d76253b81ecfaafab51f171fa725bd81b6b26fef81efa26e9374d7
     maintainers:
@@ -289,7 +302,7 @@ entries:
     version: 1.0.8
   - apiVersion: v2
     appVersion: 0.1.8
-    created: "2023-01-25T13:16:37.2437438Z"
+    created: "2023-02-08T13:43:25.915697186+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: f162c5063236777b2cc238a03162e39ac2b2bbea46e0c31c6ae01eb88d9ce5c9
     maintainers:
@@ -302,7 +315,7 @@ entries:
     version: 1.0.7
   - apiVersion: v2
     appVersion: 0.1.8
-    created: "2023-01-25T13:16:37.2433423Z"
+    created: "2023-02-08T13:43:25.915370028+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: cb09166912e10c092c0f15ff5aee21e5f6a57d5ffc02047695991d0f7fc019d6
     maintainers:
@@ -315,7 +328,7 @@ entries:
     version: 1.0.6
   - apiVersion: v2
     appVersion: 0.1.7
-    created: "2023-01-25T13:16:37.2429146Z"
+    created: "2023-02-08T13:43:25.915097455+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 4941bcbfc5d054cf958befda1a65a2e32773aaddd59af4b2f9420353465f0be4
     maintainers:
@@ -328,7 +341,7 @@ entries:
     version: 1.0.5
   - apiVersion: v2
     appVersion: 0.1.6
-    created: "2023-01-25T13:16:37.2425506Z"
+    created: "2023-02-08T13:43:25.914832402+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 8753d366172031ce0386c50f6857c1ac6e1f094f9ed03ad01e33f3619c6e7880
     maintainers:
@@ -341,7 +354,7 @@ entries:
     version: 1.0.4
   - apiVersion: v2
     appVersion: 0.1.5
-    created: "2023-01-25T13:16:37.2421611Z"
+    created: "2023-02-08T13:43:25.914543169+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 2aa879712ad7ce33424b5f3477acf6a90480ba317e63dd1f343f4beac66b1c0e
     maintainers:
@@ -354,7 +367,7 @@ entries:
     version: 1.0.3
   - apiVersion: v2
     appVersion: 0.1.4
-    created: "2023-01-25T13:16:37.2417496Z"
+    created: "2023-02-08T13:43:25.914239736+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 145ce2e722a9d8c95f147a5d608e00a5c47addbaeb9ea4882491e1e185c949b4
     maintainers:
@@ -367,7 +380,7 @@ entries:
     version: 1.0.2
   - apiVersion: v2
     appVersion: 0.1.4
-    created: "2023-01-25T13:16:37.2398177Z"
+    created: "2023-02-08T13:43:25.912184003+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 8f780ec9b25ca9d4461c076203a7d31889499a134086df72ce26096f0eb71ce9
     maintainers:
@@ -380,7 +393,7 @@ entries:
     version: 1.0.1
   - apiVersion: v2
     appVersion: 0.1.0
-    created: "2023-01-25T13:16:37.2391835Z"
+    created: "2023-02-08T13:43:25.91186527+01:00"
     description: A Helm chart for the k8s_gateway CoreDNS plugin
     digest: 2744fcdd9840590cb9f86099135229ca2fd8b3a140bcf141a3ed206191dfd3f6
     maintainers:
@@ -391,4 +404,4 @@ entries:
     urls:
     - https://ori-edge.github.io/k8s_gateway/charts/k8s-gateway-1.0.0.tgz
     version: 1.0.0
-generated: "2023-01-25T13:16:37.2386485Z"
+generated: "2023-02-08T13:43:25.911467972+01:00"