Skip to content

Commit

Permalink
It's been a while since the last upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
mmusnjak committed Apr 26, 2024
1 parent 5d79418 commit 3b47b9b
Show file tree
Hide file tree
Showing 94 changed files with 10,178 additions and 1,626 deletions.
6 changes: 3 additions & 3 deletions clusters/dev/dev-cluster-1/env.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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.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",
k: import "github.com/jsonnet-libs/k8s-libsonnet/1.29/main.libsonnet",
flux: import "github.com/jsonnet-libs/fluxcd-libsonnet/2.2.2/main.libsonnet",
prom: import "github.com/jsonnet-libs/kube-prometheus-libsonnet/0.13/main.libsonnet",
utils: import "utils.libsonnet",
},
}
6 changes: 3 additions & 3 deletions jsonnetfile.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"source": {
"git": {
"remote": "https://github.com/jsonnet-libs/fluxcd-libsonnet.git",
"subdir": "0.41.1"
"subdir": "2.2.2"
}
},
"version": "main"
Expand All @@ -14,7 +14,7 @@
"source": {
"git": {
"remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
"subdir": "1.26"
"subdir": "1.29"
}
},
"version": "main"
Expand All @@ -35,7 +35,7 @@
"subdir": "jsonnet/kube-prometheus"
}
},
"version": "v0.12.0"
"version": "v0.13.0"
}
],
"legacyImports": false
Expand Down
80 changes: 40 additions & 40 deletions jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "grafana"
}
},
"version": "d039275e4916aceae1c137120882e01d857787ac",
"sum": "515vMn4x4tP8vegL4HLW0nDO5+njGTgnDZB5OOhtsCI="
"version": "5698c8940b6dadca3f42107b7839557bc041761f",
"sum": "l6fPvh3tW6fWot308w71QY/amrYsFPeitvz1IgJxqQA="
},
{
"source": {
Expand All @@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
"version": "9d2cda4e44a26f064d8578e258bbba2fc3cd5b73",
"sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
"version": "60051be9908649b1a0f2d000dc75b3bd0822d53c",
"sum": "GdePvMDfLQcVhwzk/Ephi/jC27ywGObLB5t0eC0lXd4="
},
{
"source": {
Expand All @@ -28,8 +28,8 @@
"subdir": "grafana-mixin"
}
},
"version": "e9cb2a313ecc5a8e3cfeca7d2b7df2878802096e",
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
"version": "ff85ec33c56ffe567e6bde27473d9493eb70c743",
"sum": "XU7Xro0gZXkMga+zV69MUus8HePLzSWrYJUJCYFNELE="
},
{
"source": {
Expand All @@ -38,7 +38,7 @@
"subdir": "grafonnet"
}
},
"version": "f0b70307b8e5f12236b277883d998af129a8211f",
"version": "a1d61cce1da59c71409b99b5c7568511fec661ea",
"sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc="
},
{
Expand All @@ -48,7 +48,7 @@
"subdir": "grafonnet-7.0"
}
},
"version": "f0b70307b8e5f12236b277883d998af129a8211f",
"version": "a1d61cce1da59c71409b99b5c7568511fec661ea",
"sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
},
{
Expand All @@ -58,28 +58,28 @@
"subdir": "grafana-builder"
}
},
"version": "09d09656d6b87baac6c36bbe98df30bd315943bf",
"sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
"version": "33d0c06eadc2558b339903771425c26b4e157919",
"sum": "5ku1Hd8UPnjmn8nWyaTFzMpT3Pa+VylBnmposMSVEuU="
},
{
"source": {
"git": {
"remote": "https://github.com/jsonnet-libs/fluxcd-libsonnet.git",
"subdir": "0.41.1"
"subdir": "2.2.2"
}
},
"version": "1450a64abb91c33ec5bd69b764ee36ba28ab4cd7",
"sum": "uCdVNOdDQrm83ArEgn/4HJG8k3o0EU286FivM9i8Y3k="
"version": "ac70d483b7224785064694cb4baac761203e3059",
"sum": "LWvUGot54/+NEfSaZSbxyo5hQRIm2EhafQMT18mmvx0="
},
{
"source": {
"git": {
"remote": "https://github.com/jsonnet-libs/k8s-libsonnet.git",
"subdir": "1.26"
"subdir": "1.29"
}
},
"version": "9e5b48eee32913938d3cac30f183b49ecd9fe13a",
"sum": "7pl3HQqiKg4zJ0dWFqMo9yMGDEvlVdxgPGr1rMm0/LE="
"version": "bf9a62cfd32a58c071b8410bfcdec058475dd25e",
"sum": "i2w3hGbgQmaB73t5LJHSioPOVdYv8ZBvivHiDwZJVyI="
},
{
"source": {
Expand All @@ -88,8 +88,8 @@
"subdir": ""
}
},
"version": "a040840d2853ee07eb5fc7f144af3536573c38b7",
"sum": "eoEiHjbYtMjThfyj8GZWugArl9cOVFSW8nb6zyfGbuc="
"version": "63d430b69a95741061c2f7fc9d84b1a778511d9c",
"sum": "qiZi3axUSXCVzKUF83zSAxklwrnitMmrDK4XAfjPMdE="
},
{
"source": {
Expand All @@ -98,8 +98,8 @@
"subdir": ""
}
},
"version": "05ca993f01ee4dada3ea4d2afd51693784c6d858",
"sum": "SqrljHWptkp0AT2w5/+n1KdE8EWzr3KydvW2DCltKnA="
"version": "63337d921db856bbcd2e91814a0ac90c250410d6",
"sum": "x8/bMVUaNMZEh6mcwhLmTlBJnaleRqhhV+w/+h0H0Pc="
},
{
"source": {
Expand All @@ -108,8 +108,8 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "abe3fd3184e16893b5a47196f90a94ed13e1b04d",
"sum": "TOS2nb0CFfVg+Bc7+AT/nPivCQO6zkefZb3wHN2E5/E="
"version": "93fe0be5e6af92c7a41a7dfb589494838367b6a7",
"sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g="
},
{
"source": {
Expand All @@ -118,8 +118,8 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "abe3fd3184e16893b5a47196f90a94ed13e1b04d",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
"version": "93fe0be5e6af92c7a41a7dfb589494838367b6a7",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
"source": {
Expand All @@ -128,8 +128,8 @@
"subdir": "jsonnet/kube-prometheus"
}
},
"version": "0198f98f682f1d7e40b1dd5615437a916107f1aa",
"sum": "6+5lLp9I2V3kp1mbIRXlkzcKETovcnyHr9JZyeMOgLI="
"version": "2648d6fc4e5fb1f98c2914aa2be902476e68cc7a",
"sum": "KM1GoEgctKimA+J9bc0wGN2ilsEc4Wg7VYsdy6q/yV4="
},
{
"source": {
Expand All @@ -138,8 +138,8 @@
"subdir": "jsonnet/mixin"
}
},
"version": "21147bd93fa83f01b3fbf1542015d3508962561a",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"version": "89858173a30ae83b34f4019610d817eb6712d40b",
"sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
"name": "prometheus-operator-mixin"
},
{
Expand All @@ -149,8 +149,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "21147bd93fa83f01b3fbf1542015d3508962561a",
"sum": "mIHCeM53O4u5RBf4z2Snl+CQRDINv4J3bMygsQWauq4="
"version": "89858173a30ae83b34f4019610d817eb6712d40b",
"sum": "c2r/2d05k/SGfaOG3zKEfggclrPHd60E3y55xj2kHOo="
},
{
"source": {
Expand All @@ -159,8 +159,8 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "258fab7cdd551f2cf251ed0348f0ad7289aee789",
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
"version": "41db3af00d94b190fde5343e1c7d277d6dd03aa9",
"sum": "1d7ZKYArJKacAWXLUz0bRC1uOkozee/PPw97/W5zGhc=",
"name": "alertmanager"
},
{
Expand All @@ -170,8 +170,8 @@
"subdir": "docs/node-mixin"
}
},
"version": "a954c9fea6bcccea7f68a77a002a2a878ef1d60c",
"sum": "tappaHscNBSJCA6ypSWt7DDhohIOkxNjcLFRb3WKpu4="
"version": "cadb1d1190ad95c66b951758f01ff4c94e55e6ce",
"sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
},
{
"source": {
Expand All @@ -180,8 +180,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "c0d8a56c69014279464c0e15d8bfb0e153af0dab",
"sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=",
"version": "e6d3a9b65012ec28f00976a6e08830a4c5553845",
"sum": "8OngT76gVXOUROOOeP9yTe6E/dn+2D2J34Dn690QCG0=",
"name": "prometheus"
},
{
Expand All @@ -191,8 +191,8 @@
"subdir": "config/crd/bases"
}
},
"version": "490bebc3ac2a93497301e76019adcb22eed6c543",
"sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
"version": "551856d42dff02ec38c5b0ea6a2d99c4cb127e82",
"sum": "bY/Pcrrbynguq8/HaI88cQ3B2hLv/xc+76QILY7IL+g="
},
{
"source": {
Expand All @@ -201,8 +201,8 @@
"subdir": "mixin"
}
},
"version": "fe3f5d24192570038e9576307e1b31794920a1f3",
"sum": "Io++1+lp1oQVoQiVRSCXUiGdTIRPV7aL6Ewgs3bShEs=",
"version": "edd33797cb386c112951a0557bac1b3735f8ded4",
"sum": "WhheqsiX0maUXByZFsb9xhCEsGXK2955bPmPPf1x+Cs=",
"name": "thanos-mixin"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.0
app.kubernetes.io/version: 0.26.0
name: main
namespace: monitoring
spec:
image: quay.io/prometheus/alertmanager:v0.25.0
image: quay.io/prometheus/alertmanager:v0.26.0
nodeSelector:
kubernetes.io/os: linux
podMetadata:
Expand All @@ -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.25.0
app.kubernetes.io/version: 0.26.0
replicas: 2
resources:
limits:
Expand All @@ -33,4 +33,4 @@ spec:
runAsNonRoot: true
runAsUser: 1000
serviceAccountName: alertmanager-main
version: 0.25.0
version: 0.26.0
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.0
app.kubernetes.io/version: 0.26.0
name: alertmanager-main
namespace: monitoring
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.0
app.kubernetes.io/version: 0.26.0
name: alertmanager-main
namespace: monitoring
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.0
app.kubernetes.io/version: 0.26.0
prometheus: k8s
role: alert-rules
name: alertmanager-main-rules
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.0
app.kubernetes.io/version: 0.26.0
name: alertmanager-main
namespace: monitoring
stringData:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.0
app.kubernetes.io/version: 0.26.0
name: alertmanager-main
namespace: monitoring
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.25.0
app.kubernetes.io/version: 0.26.0
name: alertmanager-main
namespace: monitoring
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.0
app.kubernetes.io/version: 0.26.0
name: alertmanager-main
namespace: monitoring
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: blackbox-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.23.0
app.kubernetes.io/version: 0.24.0
name: blackbox-exporter
namespace: monitoring
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: blackbox-exporter
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 0.23.0
app.kubernetes.io/version: 0.24.0
name: blackbox-exporter-configuration
namespace: monitoring
Loading

0 comments on commit 3b47b9b

Please sign in to comment.