fix(deps) update kube-state-metrics source repo branch to main (#1968)

* update ksm target git branch name

* `jb update`; `make generate`
This commit is contained in:
Jonathan Cole
2022-12-16 05:57:29 -08:00
committed by GitHub
parent f4618411fd
commit 2d331eaa7f
8 changed files with 50 additions and 15 deletions

View File

@@ -36,7 +36,7 @@ There is also a #prometheus channel on the [CNCF Slack](https://slack.cncf.io/).
## kube-state-metrics
For documentation, see the project's [docs directory](https://github.com/kubernetes/kube-state-metrics/tree/master/docs).
For documentation, see the project's [docs directory](https://github.com/kubernetes/kube-state-metrics/tree/main/docs).
For questions, use the #kube-state-metrics channel on the [Kubernetes Slack](https://slack.k8s.io/).

View File

@@ -64,7 +64,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "master"
"version": "main"
},
{
"source": {
@@ -73,7 +73,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "master"
"version": "main"
},
{
"source": {

View File

@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
"version": "40cc73c22eff232534602031f0db6fa9bb918a75",
"version": "ee9db729da87bd7a694909b5b9a2ab816f55125c",
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
},
{
@@ -58,7 +58,7 @@
"subdir": "grafana-builder"
}
},
"version": "ffd29d159b574ba549dd2d87953dd28a597b1472",
"version": "fbc370e7804314d4ed73df8b6f100530c3e15b55",
"sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "44aea58610a9fcfa7ca1158d9c71e55d2e33ace0",
"version": "5d6cb391172960c2aaf98bd729eb55ef0511e0c6",
"sum": "4PJ2ROxODsoYO/1Y70+dgLZVjW5zlfzB+TDpxJBHwaI="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "44aea58610a9fcfa7ca1158d9c71e55d2e33ace0",
"version": "5d6cb391172960c2aaf98bd729eb55ef0511e0c6",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "49a12372e228f881ea388d480b45736fa6cc97cd",
"version": "f05c64c74df03ae4f78e547b8d1b52f1439d8549",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "49a12372e228f881ea388d480b45736fa6cc97cd",
"sum": "YmH5ulQrf0BAXuOzdNaMpHnlXTJE0urk+MT0i62iM50="
"version": "f05c64c74df03ae4f78e547b8d1b52f1439d8549",
"sum": "wJ1E8XxYJ0RJrUuDNWLzE7bzo6JrH7P9q1lAu/xi4Ow="
},
{
"source": {
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "1b202b91bf269b737d9fae2930fe4fb1a5c43ab2",
"version": "99a464c914ce265e9db2d64036c9785eb09f6a5e",
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
"name": "alertmanager"
},
@@ -130,7 +130,7 @@
"subdir": "docs/node-mixin"
}
},
"version": "9869d34a24d440ddd661c434556482935a09baac",
"version": "8cbe5cda8b2667f4dcdf7c22560a01f38905289c",
"sum": "5H6gKQvR23QHpvNvLkNn9DL3Vx37g015eHG2iqrlCzE="
},
{
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "72a48321dabed43f2cd9e510dda96c50d4a48a58",
"version": "77dd468cc6324d80efd90d7766c490037b998d67",
"sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=",
"name": "prometheus"
},
@@ -161,7 +161,7 @@
"subdir": "mixin"
}
},
"version": "72083fc5657bc42c0ad58f1a5bb01afb23e0a3ff",
"version": "368765e4ff02f7a6f2f5d3aefcc852a121f79d1a",
"sum": "7tyoT2wSJ8U7+zMmT5w549MRGk5k6ViDSz5A8/sia88=",
"name": "thanos-mixin"
},

View File

@@ -4381,6 +4381,12 @@ spec:
the resource's namespace. If present, it will be added to the generated
Alertmanager configuration as a first-level route.
properties:
activeTimeIntervals:
description: ActiveTimeIntervals is a list of MuteTimeInterval
names when this route should be active.
items:
type: string
type: array
continue:
description: Boolean indicating whether an alert should continue
matching subsequent sibling nodes. It will always be overridden

View File

@@ -2719,6 +2719,16 @@ spec:
to ensure the Prometheus Operator knows what version of Alertmanager
is being configured.
type: string
imagePullPolicy:
description: Image pull policy for the 'alertmanager', 'init-config-reloader'
and 'config-reloader' containers. See https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
for more details.
enum:
- ""
- Always
- Never
- IfNotPresent
type: string
imagePullSecrets:
description: An optional list of references to secrets in the same
namespace to use for pulling prometheus and alertmanager images

View File

@@ -2954,6 +2954,16 @@ spec:
to ensure the Prometheus Operator knows what version of Prometheus
is being configured.
type: string
imagePullPolicy:
description: Image pull policy for the 'prometheus', 'init-config-reloader'
and 'config-reloader' containers. See https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
for more details.
enum:
- ""
- Always
- Never
- IfNotPresent
type: string
imagePullSecrets:
description: An optional list of references to secrets in the same
namespace to use for pulling prometheus and alertmanager images

View File

@@ -55,7 +55,6 @@ spec:
minLength: 1
type: string
partial_response_strategy:
default: ""
description: 'PartialResponseStrategy is only used by ThanosRuler
and will be ignored by Prometheus instances. More info: https://github.com/thanos-io/thanos/blob/main/docs/components/rule.md#partial-response'
pattern: ^(?i)(abort|warn)?$

View File

@@ -2381,6 +2381,16 @@ spec:
image:
description: Thanos container image URL.
type: string
imagePullPolicy:
description: Image pull policy for the 'thanos', 'init-config-reloader'
and 'config-reloader' containers. See https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
for more details.
enum:
- ""
- Always
- Never
- IfNotPresent
type: string
imagePullSecrets:
description: An optional list of references to secrets in the same
namespace to use for pulling thanos images from registries see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod