Merge pull request #215 from projectsyn/fix-monitoring-networkpolicy

Fix monitoring network policy to use component-prometheus
projectsyn · Jun 9, 2023 · c3a74c0 · c3a74c0
2 parents 6bf790a + 86979de
commit c3a74c0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/component/prometheus-netpol.jsonnet b/component/prometheus-netpol.jsonnet
@@ -4,14 +4,11 @@ local inv = kap.inventory();
 local params = inv.parameters.keycloak;
 
 local prometheus_namespace =
-  if std.objectHas(inv.parameters, 'rancher_monitoring') then
-    inv.parameters.rancher_monitoring.namespace
-  else
-    'syn-synsights';
+  'syn-infra-monitoring';
 local prometheus_name = 'prometheus';
 
 local keycloak_namespace = params.namespace;
-local keycloak_name = params.name;
+local keycloak_name = 'keycloakx';
 
 local name = prometheus_name + '-' + prometheus_namespace + '-to-' + keycloak_name;
 
@@ -32,14 +29,14 @@ local netpol =
               },
               podSelector: {
                 matchLabels: {
-                  app: prometheus_name,
+                  'app.kubernetes.io/component': prometheus_name,
                 },
               },
             },
           ],
           ports: [
             {
-              port: 9990,
+              port: 8080,
               protocol: 'TCP',
             },
           ],

diff --git a/tests/golden/builtin/builtin/builtin/40_netpol.yaml b/tests/golden/builtin/builtin/builtin/40_netpol.yaml
@@ -3,25 +3,25 @@ kind: NetworkPolicy
 metadata:
   annotations: {}
   labels:
-    name: prometheus-syn-synsights-to-keycloak
-  name: prometheus-syn-synsights-to-keycloak
+    name: prometheus-syn-infra-monitoring-to-keycloakx
+  name: prometheus-syn-infra-monitoring-to-keycloakx
   namespace: syn-builtin
 spec:
   egress: []
   ingress:
     - from:
         - namespaceSelector:
             matchLabels:
-              name: syn-synsights
+              name: syn-infra-monitoring
           podSelector:
             matchLabels:
-              app: prometheus
+              app.kubernetes.io/component: prometheus
       ports:
-        - port: 9990
+        - port: 8080
           protocol: TCP
   podSelector:
     matchLabels:
-      app.kubernetes.io/instance: keycloak
-      app.kubernetes.io/name: keycloak
+      app.kubernetes.io/instance: keycloakx
+      app.kubernetes.io/name: keycloakx
   policyTypes:
     - Ingress