diff --git a/apps/k8s01/dns/dns.yaml b/apps/k8s01/dns/dns.yaml index f15483a9078bea67732d2803d56a3a1493d8a944..6d9c52dafc8c6aba477171cfe719d9c96aeecdb3 100644 --- a/apps/k8s01/dns/dns.yaml +++ b/apps/k8s01/dns/dns.yaml @@ -182,6 +182,10 @@ spec: protocol: TCP port: 80 targetPort: 80 + - name: metrics + protocol: TCP + port: 8080 + targetPort: 80 --- apiVersion: policy/v1 kind: PodDisruptionBudget diff --git a/apps/k8s01/dns/kustomization.yaml b/apps/k8s01/dns/kustomization.yaml index c576d92cd9c87540c1274f1cb5c29e2fbfaa4095..38942f3a6cd1fe88e8a927bc0d154c8796593e5b 100644 --- a/apps/k8s01/dns/kustomization.yaml +++ b/apps/k8s01/dns/kustomization.yaml @@ -8,4 +8,7 @@ resources: - networkpolicy.yaml - servicemonitor.yaml - ../../../shared/networkpolicies/allow-from-same-namespace.yaml + - ../../../shared/networkpolicies/allow-from-monitoring.yaml - ../../../shared/resourcequotas/default.yaml +patchesStrategicMerge: + - networkpolicy-patch.yaml diff --git a/apps/k8s01/dns/networkpolicy-patch.yaml b/apps/k8s01/dns/networkpolicy-patch.yaml new file mode 100644 index 0000000000000000000000000000000000000000..0f6c2deed26a189aeb039b374b3957a9472e74d9 --- /dev/null +++ b/apps/k8s01/dns/networkpolicy-patch.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: allow-from-monitoring +spec: + podSelector: + matchExpressions: + - key: app + operator: In + values: + - resolver \ No newline at end of file diff --git a/apps/k8s01/dns/servicemonitor.yaml b/apps/k8s01/dns/servicemonitor.yaml index 530defd100fdc20f4fa0badc04e9740127ff227c..ed4498c556d2258a1e0d27c5f267dee45355a6f8 100644 --- a/apps/k8s01/dns/servicemonitor.yaml +++ b/apps/k8s01/dns/servicemonitor.yaml @@ -10,5 +10,5 @@ spec: matchLabels: app: resolver endpoints: - - port: http + - port: metrics path: /metrics