Merge pull request #307 from projectsyn/fix/bootstrap-servicemonitor

Apply `monitoring.coreos.com/v1` resources after ArgoCD custom resource

Author: simu

component/monitoring.libsonnet

@@ -11,6 +11,13 @@ local serviceMonitor(objname, name) =
     metadata: {
       name: objname,
       namespace: params.namespace,
+      annotations: {
+        // NOTE(sg): moving servicemonitor sync after argocd custom resource,
+        // same as espejote admission. This should ensure that bootstrap works
+        // on clusters where the ServiceMonitor CRD is installed via
+        // component-prometheus.
+        'argocd.argoproj.io/sync-wave': '20',
+      },
       labels: {
         name: objname,
         'app.kubernetes.io/name': name,
@@ -41,6 +48,13 @@ local alert_rules =
     metadata: {
       name: 'argocd',
       namespace: params.namespace,
+      annotations: {
+        // NOTE(sg): moving servicemonitor sync after argocd custom resource,
+        // same as espejote admission. This should ensure that bootstrap works
+        // on clusters where the ServiceMonitor CRD is installed via
+        // component-prometheus.
+        'argocd.argoproj.io/sync-wave': '20',
+      },
       labels: {
         name: 'argocd',
         role: 'alert-rules',

tests/golden/defaults/argocd/argocd/01_namespace/20_monitoring.yaml

@@ -1,6 +1,8 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-metrics
     app.kubernetes.io/part-of: argocd
@@ -18,6 +20,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-server-metrics
     app.kubernetes.io/part-of: argocd
@@ -35,6 +39,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-repo-server
     app.kubernetes.io/part-of: argocd
@@ -52,6 +58,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     cluster_id: c-green-test-1234
     name: argocd

tests/golden/https-catalog/argocd/argocd/01_namespace/20_monitoring.yaml

@@ -1,6 +1,8 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-metrics
     app.kubernetes.io/part-of: argocd
@@ -18,6 +20,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-server-metrics
     app.kubernetes.io/part-of: argocd
@@ -35,6 +39,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-repo-server
     app.kubernetes.io/part-of: argocd
@@ -52,6 +58,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     cluster_id: c-green-test-1234
     name: argocd

tests/golden/openshift/argocd/argocd/01_namespace/20_monitoring.yaml

@@ -1,6 +1,8 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-metrics
     app.kubernetes.io/part-of: argocd
@@ -18,6 +20,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-server-metrics
     app.kubernetes.io/part-of: argocd
@@ -35,6 +39,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-repo-server
     app.kubernetes.io/part-of: argocd
@@ -52,6 +58,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     cluster_id: c-green-test-1234
     name: argocd

tests/golden/params/argocd/argocd/01_namespace/20_monitoring.yaml

@@ -1,6 +1,8 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-metrics
     app.kubernetes.io/part-of: argocd
@@ -18,6 +20,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-server-metrics
     app.kubernetes.io/part-of: argocd
@@ -35,6 +39,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-repo-server
     app.kubernetes.io/part-of: argocd
@@ -52,6 +58,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     cluster_id: c-green-test-1234
     name: argocd

tests/golden/prometheus/argocd/argocd/01_namespace/20_monitoring.yaml

@@ -1,6 +1,8 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-metrics
     app.kubernetes.io/part-of: argocd
@@ -19,6 +21,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-server-metrics
     app.kubernetes.io/part-of: argocd
@@ -37,6 +41,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-repo-server
     app.kubernetes.io/part-of: argocd
@@ -55,6 +61,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     cluster_id: c-green-test-1234
     monitoring.syn.tools/enabled: 'true'

tests/golden/syn-teams/argocd/argocd/01_namespace/20_monitoring.yaml

@@ -1,6 +1,8 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-metrics
     app.kubernetes.io/part-of: argocd
@@ -18,6 +20,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-server-metrics
     app.kubernetes.io/part-of: argocd
@@ -35,6 +39,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     app.kubernetes.io/name: syn-argocd-repo-server
     app.kubernetes.io/part-of: argocd
@@ -52,6 +58,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: '20'
   labels:
     cluster_id: c-green-test-1234
     name: argocd