diff --git a/.github/workflows/versions.yaml b/.github/workflows/versions.yaml index 04db94ff96613108e3cc2e3057d06c00d7a0b1ff..8f927484d3b5d72861bc1d6a026b02bf79ac6be3 100644 --- a/.github/workflows/versions.yaml +++ b/.github/workflows/versions.yaml @@ -10,10 +10,10 @@ jobs: strategy: matrix: branch: - - 'release-0.6' - 'release-0.7' - 'release-0.8' - 'release-0.9' + - 'release-0.10' - 'main' steps: - uses: actions/checkout@v2 diff --git a/Makefile b/Makefile index 458395b1be2b1d7c3eef2dfe9c37d7c43fe85285..a4d88b6dea28237ef87a8cafaf85b22138a58615 100644 --- a/Makefile +++ b/Makefile @@ -51,13 +51,13 @@ update: $(JB_BIN) $(JB_BIN) update .PHONY: validate -validate: validate-1.21 validate-1.22 - -validate-1.21: - KUBE_VERSION=1.21.1 $(MAKE) kubeconform +validate: validate-1.22 validate-1.23 validate-1.22: - KUBE_VERSION=1.22.0 $(MAKE) kubeconform + KUBE_VERSION=1.22.4 $(MAKE) kubeconform + +validate-1.23: + KUBE_VERSION=1.23.0 $(MAKE) kubeconform .PHONY: kubeconform kubeconform: crdschemas manifests $(KUBECONFORM_BIN) diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json index b35233dfcdc1ae3c255cc30f416f50295649af5f..c9b9c67e661d1153fa2b40e2a0f86eea198b73a0 100644 --- a/jsonnet/kube-prometheus/jsonnetfile.json +++ b/jsonnet/kube-prometheus/jsonnetfile.json @@ -8,7 +8,7 @@ "subdir": "grafana" } }, - "version": "199e363523104ff8b3a12483a4e3eca86372b078" + "version": "master" }, { "source": { @@ -17,7 +17,7 @@ "subdir": "contrib/mixin" } }, - "version": "release-3.5" + "version": "main" }, { "source": { @@ -26,7 +26,7 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "release-0.53" + "version": "main" }, { "source": { @@ -35,7 +35,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "release-0.53", + "version": "main", "name": "prometheus-operator-mixin" }, { @@ -45,7 +45,7 @@ "subdir": "" } }, - "version": "release-0.10" + "version": "master" }, { "source": { @@ -54,7 +54,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "release-2.3" + "version": "master" }, { "source": { @@ -63,7 +63,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "release-2.3" + "version": "master" }, { "source": { @@ -72,7 +72,7 @@ "subdir": "docs/node-mixin" } }, - "version": "release-1.3" + "version": "master" }, { "source": { @@ -81,7 +81,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "release-2.32", + "version": "main", "name": "prometheus" }, { @@ -91,7 +91,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "release-0.23", + "version": "main", "name": "alertmanager" }, { @@ -101,7 +101,7 @@ "subdir": "mixin" } }, - "version": "release-0.23", + "version": "main", "name": "thanos-mixin" } ], diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index ee52976080b0730f7f8db2c3bdbd7743a4a31bcd..7ed7643990692481c67e28d2c2d0adbcb751d6c8 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,8 +18,8 @@ "subdir": "contrib/mixin" } }, - "version": "73080a716634f45d50d0593e0454ed3206a52f5b", - "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc=" + "version": "42840d0fda78811be7ac0cdd18d7d2c3408268cc", + "sum": "cdKL5kPYfpWSpTCu4qctmh+gWQqL+4YWom6rw9qLYJU=" }, { "source": { @@ -48,8 +48,8 @@ "subdir": "" } }, - "version": "b538a10c89508f8d12885680cca72a134d3127f5", - "sum": "GLt5T2k4RKg36Gfcaf9qlTfVumDitqotVD0ipz/bPJ4=" + "version": "fd913499e956da06f520c3784c59573ee552b152", + "sum": "0NaFSDIXJnFGN7vJPDQkxpVXWfZJBns1xwCPnHLvbj8=" }, { "source": { @@ -68,7 +68,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "b550d7a3bce031bdb51c4bf21cc992a785fc3188", + "version": "04ac65bd45dd505100b71ac7021770c76c4417bc", "sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y=" }, { @@ -78,7 +78,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "b550d7a3bce031bdb51c4bf21cc992a785fc3188", + "version": "04ac65bd45dd505100b71ac7021770c76c4417bc", "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" }, { @@ -88,7 +88,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "1b4cc829251a4c129615efe707d9403c7248888e", + "version": "dec443d201f008a5d30c62b153b2558638cdc34e", "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=", "name": "prometheus-operator-mixin" }, @@ -99,7 +99,7 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "1b4cc829251a4c129615efe707d9403c7248888e", + "version": "dec443d201f008a5d30c62b153b2558638cdc34e", "sum": "9R1mw4Tz0/1V1QWkJMzqE4+iXXONEfYVikW8Mj5AOcA=" }, { @@ -109,7 +109,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "16fa045db47d68a09a102c7b80b8899c1f57c153", + "version": "e2a10119aaf7777fa523d216e05897c5b719134c", "sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=", "name": "alertmanager" }, @@ -120,7 +120,7 @@ "subdir": "docs/node-mixin" } }, - "version": "a2321e7b940ddcff26873612bccdf7cd4c42b6b6", + "version": "2028460438d502be6137ac0738068538cd8fafe1", "sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk=" }, { @@ -130,7 +130,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "67a64ee092b79e797ea9aa46856a15c435093c7e", + "version": "c92673fb1480cd6e3404a004522cbb851be4115d", "sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=", "name": "prometheus" }, @@ -141,8 +141,8 @@ "subdir": "mixin" } }, - "version": "632032712f12eea0015aaef24ee1e14f38ef3e55", - "sum": "X+060DnePPeN/87fgj0SrfxVitywTk8hZA9V4nHxl1g=", + "version": "79e70da702228ac0282fc7639f9f160d922b6dcb", + "sum": "1Y1cPIeoPg2nCAEhKPCt8bAGuwuOP2eZ3kVF432mlMA=", "name": "thanos-mixin" }, {