Update jsonnet libraries

mmusnjak · Apr 11, 2023 · 5d79418 · 5d79418
1 parent 6273ee9
commit 5d79418
Show file tree

Hide file tree

Showing 89 changed files with 5,303 additions and 1,356 deletions.
diff --git a/clusters/dev/dev-cluster-1/env.libsonnet b/clusters/dev/dev-cluster-1/env.libsonnet
@@ -6,9 +6,9 @@
     // so we can pass in the libraries that correspond to the cluster we're building this for.
     // You can override this on namespace level as well.
     libraries: {
-        k: import "github.com/jsonnet-libs/k8s-libsonnet/1.23/main.libsonnet",
-        flux: import "github.com/jsonnet-libs/fluxcd-libsonnet/0.28.5/main.libsonnet",
-        prom: import "github.com/jsonnet-libs/kube-prometheus-libsonnet/0.10/main.libsonnet",
+        k: import "github.com/jsonnet-libs/k8s-libsonnet/1.26/main.libsonnet",
+        flux: import "github.com/jsonnet-libs/fluxcd-libsonnet/0.41.1/main.libsonnet",
+        prom: import "github.com/jsonnet-libs/kube-prometheus-libsonnet/0.11/main.libsonnet",
         utils: import "utils.libsonnet",
     },
 }
diff --git a/jsonnetfile.json b/jsonnetfile.json
@@ -5,7 +5,7 @@
       "source": {
         "git": {
           "remote": "https://github.com/jsonnet-libs/fluxcd-libsonnet.git",
-          "subdir": "0.28.5"
+          "subdir": "0.41.1"
         }
       },
       "version": "main"
@@ -14,7 +14,7 @@
       "source": {
         "git": {
           "remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
-          "subdir": "1.23"
+          "subdir": "1.26"
         }
       },
       "version": "main"
@@ -35,8 +35,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "main"
+      "version": "v0.12.0"
     }
   ],
   "legacyImports": false
-}
+}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": "grafana"
         }
       },
-      "version": "e7aeb2be37ea3afcda0dd380553440b394567cd5",
-      "sum": "IujrtNI+ckmR8isarpBU6yBb2jRtVlytG/qlEOH6BF8="
+      "version": "d039275e4916aceae1c137120882e01d857787ac",
+      "sum": "515vMn4x4tP8vegL4HLW0nDO5+njGTgnDZB5OOhtsCI="
     },
     {
       "source": {
@@ -18,8 +18,8 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "682b8676530cbaad70cb9e555e11d056eceeaf4d",
-      "sum": "wIsqEIGSqnWwJApdQ7k8x2kd/AsffJhYcqUebDiS01w="
+      "version": "9d2cda4e44a26f064d8578e258bbba2fc3cd5b73",
+      "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
     },
     {
       "source": {
@@ -28,7 +28,7 @@
           "subdir": "grafana-mixin"
         }
       },
-      "version": "55e1c53e36cd02f71b13e171a3be72b87e544c6d",
+      "version": "e9cb2a313ecc5a8e3cfeca7d2b7df2878802096e",
       "sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
     },
     {
@@ -38,68 +38,68 @@
           "subdir": "grafonnet"
         }
       },
-      "version": "3626fc4dc2326931c530861ac5bebe39444f6cbf",
-      "sum": "gF8foHByYcB25jcUOBqP6jxk0OPifQMjPvKY0HaCk6w="
+      "version": "f0b70307b8e5f12236b277883d998af129a8211f",
+      "sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc="
     },
     {
       "source": {
         "git": {
-          "remote": "https://github.com/grafana/jsonnet-libs.git",
-          "subdir": "grafana-builder"
+          "remote": "https://github.com/grafana/grafonnet-lib.git",
+          "subdir": "grafonnet-7.0"
         }
       },
-      "version": "5a128df878434da37969b811e99bb9cd0a3779e3",
-      "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
+      "version": "f0b70307b8e5f12236b277883d998af129a8211f",
+      "sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
     },
     {
       "source": {
         "git": {
-          "remote": "https://github.com/jsonnet-libs/fluxcd-libsonnet.git",
-          "subdir": "0.28.5"
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "grafana-builder"
         }
       },
-      "version": "c49ba29065c0aa96b97380a7050f8f40c110c5a1",
-      "sum": "IPwPLkVi+grj+zUOF0KsHGJAD09/fGLFTf4c9WaZ6lo="
+      "version": "09d09656d6b87baac6c36bbe98df30bd315943bf",
+      "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
     },
     {
       "source": {
         "git": {
-          "remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
-          "subdir": "1.23"
+          "remote": "https://github.com/jsonnet-libs/fluxcd-libsonnet.git",
+          "subdir": "0.41.1"
         }
       },
-      "version": "f8efa81cf15257bd151b97e31599e20b2ba5311b",
-      "sum": "JLHC9nyHwGtnUOlRHTVUpFe0TQmK+Geh+YFx3kj6TbM="
+      "version": "1450a64abb91c33ec5bd69b764ee36ba28ab4cd7",
+      "sum": "uCdVNOdDQrm83ArEgn/4HJG8k3o0EU286FivM9i8Y3k="
     },
     {
       "source": {
         "git": {
-          "remote": "https://github.com/jsonnet-libs/xtd.git",
-          "subdir": ""
+          "remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
+          "subdir": "1.26"
         }
       },
-      "version": "803739029925cf31b0e3c6db2f4aae09b0378a6e",
-      "sum": "d/c+3om56mfddeYWrsxOwsrlH008BmX/5NoquXMj0+g="
+      "version": "9e5b48eee32913938d3cac30f183b49ecd9fe13a",
+      "sum": "7pl3HQqiKg4zJ0dWFqMo9yMGDEvlVdxgPGr1rMm0/LE="
     },
     {
       "source": {
         "git": {
-          "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
+          "remote": "https://github.com/jsonnet-libs/xtd.git",
           "subdir": ""
         }
       },
-      "version": "c76b9378b86d28bd617d94a57c72b4770efed510",
-      "sum": "czyBANhl44ENj9wpv7ma4jiI01F+66g8WkgJ/LmPGF8="
+      "version": "a040840d2853ee07eb5fc7f144af3536573c38b7",
+      "sum": "eoEiHjbYtMjThfyj8GZWugArl9cOVFSW8nb6zyfGbuc="
     },
     {
       "source": {
         "git": {
           "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
-          "subdir": "lib/promgrafonnet"
+          "subdir": ""
         }
       },
-      "version": "c76b9378b86d28bd617d94a57c72b4770efed510",
-      "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
+      "version": "05ca993f01ee4dada3ea4d2afd51693784c6d858",
+      "sum": "SqrljHWptkp0AT2w5/+n1KdE8EWzr3KydvW2DCltKnA="
     },
     {
       "source": {
@@ -108,8 +108,8 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "d7e618dbd869d595f4677ecb9f6b4a12d548e5c5",
-      "sum": "P/YWLrH3XliqfgRhfh68xCzCrLn2KMBYXQG9uh/UYCY="
+      "version": "abe3fd3184e16893b5a47196f90a94ed13e1b04d",
+      "sum": "TOS2nb0CFfVg+Bc7+AT/nPivCQO6zkefZb3wHN2E5/E="
     },
     {
       "source": {
@@ -118,7 +118,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "d7e618dbd869d595f4677ecb9f6b4a12d548e5c5",
+      "version": "abe3fd3184e16893b5a47196f90a94ed13e1b04d",
       "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
     },
     {
@@ -128,8 +128,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "c2d6b3e8c60891b40f72ce50bd90ae9a43a22a81",
-      "sum": "qjhJK6PYQxNaU+O6voHf9s0a5zhvsfMbTw56+arZ0Yc="
+      "version": "0198f98f682f1d7e40b1dd5615437a916107f1aa",
+      "sum": "6+5lLp9I2V3kp1mbIRXlkzcKETovcnyHr9JZyeMOgLI="
     },
     {
       "source": {
@@ -138,8 +138,8 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "c35983d61de467c60c6a39ef29d5c4cfb18504a1",
-      "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
+      "version": "21147bd93fa83f01b3fbf1542015d3508962561a",
+      "sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
       "name": "prometheus-operator-mixin"
     },
     {
@@ -149,8 +149,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "c35983d61de467c60c6a39ef29d5c4cfb18504a1",
-      "sum": "hPpoqkhs2Fc5wf7aGi3n49OOKXjpEJeRnFenjHO9Ito="
+      "version": "21147bd93fa83f01b3fbf1542015d3508962561a",
+      "sum": "mIHCeM53O4u5RBf4z2Snl+CQRDINv4J3bMygsQWauq4="
     },
     {
       "source": {
@@ -159,8 +159,8 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "4dcc0d9563c2e0e8675790f8515cb6515797d501",
-      "sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=",
+      "version": "258fab7cdd551f2cf251ed0348f0ad7289aee789",
+      "sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
       "name": "alertmanager"
     },
     {
@@ -170,8 +170,8 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "996563f9729588660d5d32826c46b0d7169b1334",
-      "sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
+      "version": "a954c9fea6bcccea7f68a77a002a2a878ef1d60c",
+      "sum": "tappaHscNBSJCA6ypSWt7DDhohIOkxNjcLFRb3WKpu4="
     },
     {
       "source": {
@@ -180,19 +180,29 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "fe06f16c116a109330cce0bcb61c2c6728ab7227",
-      "sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=",
+      "version": "c0d8a56c69014279464c0e15d8bfb0e153af0dab",
+      "sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=",
       "name": "prometheus"
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/pyrra-dev/pyrra.git",
+          "subdir": "config/crd/bases"
+        }
+      },
+      "version": "490bebc3ac2a93497301e76019adcb22eed6c543",
+      "sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
+    },
     {
       "source": {
         "git": {
           "remote": "https://github.com/thanos-io/thanos.git",
           "subdir": "mixin"
         }
       },
-      "version": "52a7834af5eaf095717736dd564537d8ac698abe",
-      "sum": "RbqWknYtfJHwMBlM+gAjqfmvV5wqn5AFV/IGcHGadM0=",
+      "version": "fe3f5d24192570038e9576307e1b31794920a1f3",
+      "sum": "Io++1+lp1oQVoQiVRSCXUiGdTIRPV7aL6Ewgs3bShEs=",
       "name": "thanos-mixin"
     }
   ],

diff --git a/manifests/dev/dev-cluster-1/monitoring/alertmanager-alertmanager.yaml b/manifests/dev/dev-cluster-1/monitoring/alertmanager-alertmanager.yaml
@@ -6,11 +6,11 @@ metadata:
     app.kubernetes.io/instance: main
     app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.23.0
+    app.kubernetes.io/version: 0.25.0
   name: main
   namespace: monitoring
 spec:
-  image: quay.io/prometheus/alertmanager:v0.23.0
+  image: quay.io/prometheus/alertmanager:v0.25.0
   nodeSelector:
     kubernetes.io/os: linux
   podMetadata:
@@ -19,7 +19,7 @@ spec:
       app.kubernetes.io/instance: main
       app.kubernetes.io/name: alertmanager
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 0.23.0
+      app.kubernetes.io/version: 0.25.0
   replicas: 2
   resources:
     limits:
@@ -33,4 +33,4 @@ spec:
     runAsNonRoot: true
     runAsUser: 1000
   serviceAccountName: alertmanager-main
-  version: 0.23.0
+  version: 0.25.0
diff --git a/manifests/dev/dev-cluster-1/monitoring/alertmanager-networkPolicy.yaml b/manifests/dev/dev-cluster-1/monitoring/alertmanager-networkPolicy.yaml
@@ -0,0 +1,42 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  labels:
+    app.kubernetes.io/component: alert-router
+    app.kubernetes.io/instance: main
+    app.kubernetes.io/name: alertmanager
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: 0.25.0
+  name: alertmanager-main
+  namespace: monitoring
+spec:
+  egress:
+  - {}
+  ingress:
+  - from:
+    - podSelector:
+        matchLabels:
+          app.kubernetes.io/name: prometheus
+    ports:
+    - port: 9093
+      protocol: TCP
+    - port: 8080
+      protocol: TCP
+  - from:
+    - podSelector:
+        matchLabels:
+          app.kubernetes.io/name: alertmanager
+    ports:
+    - port: 9094
+      protocol: TCP
+    - port: 9094
+      protocol: UDP
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/component: alert-router
+      app.kubernetes.io/instance: main
+      app.kubernetes.io/name: alertmanager
+      app.kubernetes.io/part-of: kube-prometheus
+  policyTypes:
+  - Egress
+  - Ingress
diff --git a/manifests/dev/dev-cluster-1/monitoring/alertmanager-podDisruptionBudget.yaml b/manifests/dev/dev-cluster-1/monitoring/alertmanager-podDisruptionBudget.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: main
     app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.23.0
+    app.kubernetes.io/version: 0.25.0
   name: alertmanager-main
   namespace: monitoring
 spec:

diff --git a/manifests/dev/dev-cluster-1/monitoring/alertmanager-prometheusRule.yaml b/manifests/dev/dev-cluster-1/monitoring/alertmanager-prometheusRule.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: main
     app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.23.0
+    app.kubernetes.io/version: 0.25.0
     prometheus: k8s
     role: alert-rules
   name: alertmanager-main-rules

diff --git a/manifests/dev/dev-cluster-1/monitoring/alertmanager-secret.yaml b/manifests/dev/dev-cluster-1/monitoring/alertmanager-secret.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: main
     app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.23.0
+    app.kubernetes.io/version: 0.25.0
   name: alertmanager-main
   namespace: monitoring
 stringData:

diff --git a/manifests/dev/dev-cluster-1/monitoring/alertmanager-service.yaml b/manifests/dev/dev-cluster-1/monitoring/alertmanager-service.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: main
     app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.23.0
+    app.kubernetes.io/version: 0.25.0
   name: alertmanager-main
   namespace: monitoring
 spec:

diff --git a/manifests/dev/dev-cluster-1/monitoring/alertmanager-serviceAccount.yaml b/manifests/dev/dev-cluster-1/monitoring/alertmanager-serviceAccount.yaml
@@ -1,11 +1,12 @@
 apiVersion: v1
+automountServiceAccountToken: false
 kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/component: alert-router
     app.kubernetes.io/instance: main
     app.kubernetes.io/name: alertmanager
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 0.23.0
+    app.kubernetes.io/version: 0.25.0
   name: alertmanager-main
   namespace: monitoring