Merge pull request #602 from vshn/fix-slos

Fix slos namespace
vshn · Jan 16, 2025 · 3a612ba · 3a612ba
2 parents d6f3b06 + 230f4f8
commit 3a612ba
Show file tree

Hide file tree

Showing 183 changed files with 194 additions and 194 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -377,7 +377,7 @@ parameters:
             # If the alert is pending for more than 5m this indicates a real problem.
             for: 6m
           ticket_alert: {}
-      namespace: appcat-slos
+      namespace: syn-appcat-slos
       namespaceLabels: ${appcat:namespaceLabels}
       namespaceAnnotations: ${appcat:namespaceAnnotations}
       sla_reporter:

diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml
@@ -60,7 +60,7 @@ spec:
           restoreSA: keycloakserviceaccount
           salesOrder: ''
           serviceName: keycloak
-          sliNamespace: appcat-slos
+          sliNamespace: syn-appcat-slos
         kind: ConfigMap
         metadata:
           labels:

diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml
@@ -63,7 +63,7 @@ spec:
           restoreSA: mariadbrestoreserviceaccount
           salesOrder: ''
           serviceName: mariadb
-          sliNamespace: appcat-slos
+          sliNamespace: syn-appcat-slos
         kind: ConfigMap
         metadata:
           labels:

diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml
@@ -67,7 +67,7 @@ spec:
           restoreSA: nextcloudserviceaccount
           salesOrder: ''
           serviceName: nextcloud
-          sliNamespace: appcat-slos
+          sliNamespace: syn-appcat-slos
         kind: ConfigMap
         metadata:
           labels:

diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml
@@ -94,7 +94,7 @@ spec:
             {"limits": {"cpu": "250m", "memory": "256Mi"}, "requests": {"cpu": "100m",
             "memory": "64Mi"}}, "setDbopsResult": {"limits": {"cpu": "250m", "memory":
             "256Mi"}, "requests": {"cpu": "100m", "memory": "64Mi"}}}'
-          sliNamespace: appcat-slos
+          sliNamespace: syn-appcat-slos
         kind: ConfigMap
         metadata:
           labels:

diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml
@@ -607,7 +607,7 @@ spec:
           restoreSA: redisrestoreserviceaccount
           salesOrder: ''
           serviceName: redis
-          sliNamespace: appcat-slos
+          sliNamespace: syn-appcat-slos
         kind: ConfigMap
         metadata:
           labels:

diff --git a/tests/golden/control-plane/appcat/appcat/sla_reporter/00_namespace.yaml b/tests/golden/control-plane/appcat/appcat/sla_reporter/00_namespace.yaml
@@ -5,5 +5,5 @@ metadata:
     argocd.argoproj.io/sync-wave: '-100'
     openshift.io/node-selector: node-role.kubernetes.io/infra=
   labels:
-    name: appcat-slos
-  name: appcat-slos
+    name: syn-appcat-slos
+  name: syn-appcat-slos
diff --git a/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     name: appcat-sla-reporter
   name: appcat-sla-reporter
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   concurrencyPolicy: Forbid
   failedJobsHistoryLimit: 3

diff --git a/tests/golden/control-plane/appcat/appcat/sla_reporter/02_object_bucket.yaml b/tests/golden/control-plane/appcat/appcat/sla_reporter/02_object_bucket.yaml
@@ -5,7 +5,7 @@ metadata:
     argocd.argoproj.io/compare-options: IgnoreExtraneous
     argocd.argoproj.io/sync-options: Prune=false,SkipDryRunOnMissingResource=true
   name: appcat-sla-reports
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   parameters:
     bucketName: appcat-sla-reports

diff --git a/tests/golden/control-plane/appcat/appcat/sla_reporter/03_network_policy.yaml b/tests/golden/control-plane/appcat/appcat/sla_reporter/03_network_policy.yaml
@@ -3,16 +3,16 @@ kind: NetworkPolicy
 metadata:
   annotations: {}
   labels:
-    name: allow-from-appcat-slos
-  name: allow-from-appcat-slos
+    name: allow-from-syn-appcat-slos
+  name: allow-from-syn-appcat-slos
   namespace: prometheus-system
 spec:
   egress: []
   ingress:
     - from:
         - namespaceSelector:
             matchLabels:
-              name: appcat-slos
+              name: syn-appcat-slos
   podSelector: {}
   policyTypes:
     - Ingress
diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_keycloak.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_keycloak.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnkeycloak-sla
   name: vshn-vshnkeycloak-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnkeycloak-sla-target

diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_mariadb.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_mariadb.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnmariadb-sla
   name: vshn-vshnmariadb-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnmariadb-sla-target

diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_minio.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_minio.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnminio-sla
   name: vshn-vshnminio-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnminio-sla-target

diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_nextcloud.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_nextcloud.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnnextcloud-sla
   name: vshn-vshnnextcloud-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnnextcloud-sla-target

diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_postgres.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_postgres.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnpostgresql-sla
   name: vshn-vshnpostgresql-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnpostgresql-sla-target

diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_redis.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_redis.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnredis-sla
   name: vshn-vshnredis-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnredis-sla-target

diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNKeycloak_Opsgenie.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNKeycloak_Opsgenie.yaml
@@ -6,7 +6,7 @@ metadata:
     syn_component: appcat
     syn_team: schedar
   name: vshn-vshnkeycloak-new-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnkeycloak-sla-target

diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNMariaDB_Opsgenie.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNMariaDB_Opsgenie.yaml
@@ -6,7 +6,7 @@ metadata:
     syn_component: appcat
     syn_team: schedar
   name: vshn-vshnmariadb-new-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnmariadb-sla-target

diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml
@@ -6,7 +6,7 @@ metadata:
     syn_component: appcat
     syn_team: schedar
   name: vshn-vshnminio-new-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnminio-sla-target

diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNNextcloud_Opsgenie.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNNextcloud_Opsgenie.yaml
@@ -6,7 +6,7 @@ metadata:
     syn_component: appcat
     syn_team: schedar
   name: vshn-vshnnextcloud-new-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnnextcloud-sla-target

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -5,7 +5,7 @@ metadata:
     control-plane: controller-manager
     name: controller-manager
   name: appcat-sliexporter-controller-manager
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   replicas: 1
   selector:

diff --git a/...g.coreos.com_v1_servicemonitor_appcat-sliexporter-controller-manager-metrics-monitor.yaml b/...g.coreos.com_v1_servicemonitor_appcat-sliexporter-controller-manager-metrics-monitor.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     control-plane: controller-manager
   name: appcat-sliexporter-controller-manager-metrics-monitor
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   endpoints:
     - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

diff --git a/...ac.authorization.k8s.io_v1_clusterrolebinding_appcat-sliexporter-appcat-sli-exporter.yaml b/...ac.authorization.k8s.io_v1_clusterrolebinding_appcat-sliexporter-appcat-sli-exporter.yaml
@@ -11,4 +11,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: appcat-sliexporter-controller-manager
-    namespace: appcat-slos
+    namespace: syn-appcat-slos
diff --git a/...rbac.authorization.k8s.io_v1_clusterrolebinding_appcat-sliexporter-proxy-rolebinding.yaml b/...rbac.authorization.k8s.io_v1_clusterrolebinding_appcat-sliexporter-proxy-rolebinding.yaml
@@ -11,4 +11,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: appcat-sliexporter-controller-manager
-    namespace: appcat-slos
+    namespace: syn-appcat-slos
diff --git a/...li_exporter/v1_namespace_appcat-slos.yaml → ...xporter/v1_namespace_syn-appcat-slos.yaml b/...li_exporter/v1_namespace_appcat-slos.yaml → ...xporter/v1_namespace_syn-appcat-slos.yaml
@@ -6,4 +6,4 @@ metadata:
     openshift.io/node-selector: node-role.kubernetes.io/infra=
   labels:
     control-plane: controller-manager
-  name: appcat-slos
+  name: syn-appcat-slos
diff --git a/...appcat/sli_exporter/v1_service_appcat-sliexporter-controller-manager-metrics-service.yaml b/...appcat/sli_exporter/v1_service_appcat-sliexporter-controller-manager-metrics-service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     control-plane: controller-manager
   name: appcat-sliexporter-controller-manager-metrics-service
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   ports:
     - name: https

diff --git a/...s/appcat/appcat/sli_exporter/v1_serviceaccount_appcat-sliexporter-controller-manager.yaml b/...s/appcat/appcat/sli_exporter/v1_serviceaccount_appcat-sliexporter-controller-manager.yaml
@@ -4,4 +4,4 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: '-100'
   name: appcat-sliexporter-controller-manager
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml
@@ -60,7 +60,7 @@ spec:
           restoreSA: keycloakserviceaccount
           salesOrder: ''
           serviceName: keycloak
-          sliNamespace: appcat-slos
+          sliNamespace: syn-appcat-slos
         kind: ConfigMap
         metadata:
           labels:

diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml
@@ -63,7 +63,7 @@ spec:
           restoreSA: mariadbrestoreserviceaccount
           salesOrder: ''
           serviceName: mariadb
-          sliNamespace: appcat-slos
+          sliNamespace: syn-appcat-slos
         kind: ConfigMap
         metadata:
           labels:

diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml
@@ -65,7 +65,7 @@ spec:
           restoreSA: nextcloudserviceaccount
           salesOrder: ''
           serviceName: nextcloud
-          sliNamespace: appcat-slos
+          sliNamespace: syn-appcat-slos
         kind: ConfigMap
         metadata:
           labels:

diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml
@@ -94,7 +94,7 @@ spec:
             {"limits": {"cpu": "250m", "memory": "256Mi"}, "requests": {"cpu": "100m",
             "memory": "64Mi"}}, "setDbopsResult": {"limits": {"cpu": "250m", "memory":
             "256Mi"}, "requests": {"cpu": "100m", "memory": "64Mi"}}}'
-          sliNamespace: appcat-slos
+          sliNamespace: syn-appcat-slos
         kind: ConfigMap
         metadata:
           labels:

diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml
@@ -607,7 +607,7 @@ spec:
           restoreSA: redisrestoreserviceaccount
           salesOrder: ''
           serviceName: redis
-          sliNamespace: appcat-slos
+          sliNamespace: syn-appcat-slos
         kind: ConfigMap
         metadata:
           labels:

diff --git a/tests/golden/dev/appcat/appcat/22_prom_rule_sla_keycloak.yaml b/tests/golden/dev/appcat/appcat/22_prom_rule_sla_keycloak.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnkeycloak-sla
   name: vshn-vshnkeycloak-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnkeycloak-sla-target

diff --git a/tests/golden/dev/appcat/appcat/22_prom_rule_sla_mariadb.yaml b/tests/golden/dev/appcat/appcat/22_prom_rule_sla_mariadb.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnmariadb-sla
   name: vshn-vshnmariadb-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnmariadb-sla-target

diff --git a/tests/golden/dev/appcat/appcat/22_prom_rule_sla_minio.yaml b/tests/golden/dev/appcat/appcat/22_prom_rule_sla_minio.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnminio-sla
   name: vshn-vshnminio-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnminio-sla-target

diff --git a/tests/golden/dev/appcat/appcat/22_prom_rule_sla_nextcloud.yaml b/tests/golden/dev/appcat/appcat/22_prom_rule_sla_nextcloud.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnnextcloud-sla
   name: vshn-vshnnextcloud-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnnextcloud-sla-target

diff --git a/tests/golden/dev/appcat/appcat/22_prom_rule_sla_postgres.yaml b/tests/golden/dev/appcat/appcat/22_prom_rule_sla_postgres.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnpostgresql-sla
   name: vshn-vshnpostgresql-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnpostgresql-sla-target

diff --git a/tests/golden/dev/appcat/appcat/22_prom_rule_sla_redis.yaml b/tests/golden/dev/appcat/appcat/22_prom_rule_sla_redis.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-vshnredis-sla
   name: vshn-vshnredis-sla
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: appcat-vshnredis-sla-target

diff --git a/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     name: appcat-sla-reporter
   name: appcat-sla-reporter
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   concurrencyPolicy: Forbid
   failedJobsHistoryLimit: 3

diff --git a/tests/golden/dev/appcat/appcat/sla_reporter/02_object_bucket.yaml b/tests/golden/dev/appcat/appcat/sla_reporter/02_object_bucket.yaml
@@ -5,7 +5,7 @@ metadata:
     argocd.argoproj.io/compare-options: IgnoreExtraneous
     argocd.argoproj.io/sync-options: Prune=false,SkipDryRunOnMissingResource=true
   name: appcat-sla-reports
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   parameters:
     bucketName: appcat-sla-reports

diff --git a/tests/golden/dev/appcat/appcat/sla_reporter/03_network_policy.yaml b/tests/golden/dev/appcat/appcat/sla_reporter/03_network_policy.yaml
@@ -3,16 +3,16 @@ kind: NetworkPolicy
 metadata:
   annotations: {}
   labels:
-    name: allow-from-appcat-slos
-  name: allow-from-appcat-slos
+    name: allow-from-syn-appcat-slos
+  name: allow-from-syn-appcat-slos
   namespace: prometheus-system
 spec:
   egress: []
   ingress:
     - from:
         - namespaceSelector:
             matchLabels:
-              name: appcat-slos
+              name: syn-appcat-slos
   podSelector: {}
   policyTypes:
     - Ingress
diff --git a/tests/golden/dev/appcat/appcat/sli_exporter/70_slo_vshn_keycloak.yaml b/tests/golden/dev/appcat/appcat/sli_exporter/70_slo_vshn_keycloak.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-keycloak
   name: vshn-keycloak
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: sloth-slo-sli-recordings-appcat-vshn-keycloak-uptime

diff --git a/tests/golden/dev/appcat/appcat/sli_exporter/70_slo_vshn_mariadb.yaml b/tests/golden/dev/appcat/appcat/sli_exporter/70_slo_vshn_mariadb.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     name: vshn-mariadb
   name: vshn-mariadb
-  namespace: appcat-slos
+  namespace: syn-appcat-slos
 spec:
   groups:
     - name: sloth-slo-sli-recordings-appcat-vshn-mariadb-uptime