Skip to content

Commit 5659236

Browse files
update prom version to fix build error
Signed-off-by: LiZhenCheng9527 <lizhencheng6@huawei.com>
1 parent 6663f05 commit 5659236

File tree

41 files changed

+7980
-489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+7980
-489
lines changed

hack/gen-prom.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ JB="${REPO_ROOT}/.tools/jb"
1111
PROM_OUT_PATH=${REPO_ROOT}/out/prom
1212
PROM_JSONNET_FILE=${REPO_ROOT}/$1
1313
PROM_MANIFESTS_PATH=${REPO_ROOT}/${2}
14-
KUBE_PROM_VER=${KUBE_PROM_VER:-v0.12.0}
14+
KUBE_PROM_VER=${KUBE_PROM_VER:-v0.13.0}
1515

1616
echo 'begin to generate prom manifests'
1717
echo "jsonnet: ${PROM_JSONNET_FILE}"

manifests/profiles/prom/kube-state-metrics-clusterRole.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 2.7.0
8+
app.kubernetes.io/version: 2.9.2
99
name: kube-state-metrics
1010
rules:
1111
- apiGroups:
@@ -78,6 +78,13 @@ rules:
7878
verbs:
7979
- list
8080
- watch
81+
- apiGroups:
82+
- discovery.k8s.io
83+
resources:
84+
- endpointslices
85+
verbs:
86+
- list
87+
- watch
8188
- apiGroups:
8289
- storage.k8s.io
8390
resources:

manifests/profiles/prom/kube-state-metrics-clusterRoleBinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 2.7.0
8+
app.kubernetes.io/version: 2.9.2
99
name: kube-state-metrics
1010
roleRef:
1111
apiGroup: rbac.authorization.k8s.io

manifests/profiles/prom/kube-state-metrics-deployment.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 2.7.0
8+
app.kubernetes.io/version: 2.9.2
99
name: kube-state-metrics
1010
namespace: monitoring
1111
spec:
@@ -23,7 +23,7 @@ spec:
2323
app.kubernetes.io/component: exporter
2424
app.kubernetes.io/name: kube-state-metrics
2525
app.kubernetes.io/part-of: kube-prometheus
26-
app.kubernetes.io/version: 2.7.0
26+
app.kubernetes.io/version: 2.9.2
2727
spec:
2828
automountServiceAccountToken: true
2929
containers:
@@ -32,7 +32,7 @@ spec:
3232
- --port=8081
3333
- --telemetry-host=127.0.0.1
3434
- --telemetry-port=8082
35-
image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.7.0
35+
image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.9.2
3636
name: kube-state-metrics
3737
resources:
3838
limits:
@@ -47,13 +47,15 @@ spec:
4747
drop:
4848
- ALL
4949
readOnlyRootFilesystem: true
50+
runAsNonRoot: true
5051
runAsUser: 65534
52+
seccompProfile:
53+
type: RuntimeDefault
5154
- args:
52-
- --logtostderr
5355
- --secure-listen-address=:8443
5456
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
5557
- --upstream=http://127.0.0.1:8081/
56-
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
58+
image: quay.io/brancz/kube-rbac-proxy:v0.14.2
5759
name: kube-rbac-proxy-main
5860
ports:
5961
- containerPort: 8443
@@ -75,11 +77,10 @@ spec:
7577
runAsNonRoot: true
7678
runAsUser: 65532
7779
- args:
78-
- --logtostderr
7980
- --secure-listen-address=:9443
8081
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
8182
- --upstream=http://127.0.0.1:8082/
82-
image: quay.io/brancz/kube-rbac-proxy:v0.14.0
83+
image: quay.io/brancz/kube-rbac-proxy:v0.14.2
8384
name: kube-rbac-proxy-self
8485
ports:
8586
- containerPort: 9443

manifests/profiles/prom/kube-state-metrics-networkPolicy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 2.7.0
8+
app.kubernetes.io/version: 2.9.2
99
name: kube-state-metrics
1010
namespace: monitoring
1111
spec:

manifests/profiles/prom/kube-state-metrics-prometheusRule.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 2.7.0
8+
app.kubernetes.io/version: 2.9.2
99
prometheus: k8s
1010
role: alert-rules
1111
name: kube-state-metrics-rules
@@ -20,9 +20,9 @@ spec:
2020
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kube-state-metrics/kubestatemetricslisterrors
2121
summary: kube-state-metrics is experiencing errors in list operations.
2222
expr: |
23-
(sum(rate(kube_state_metrics_list_total{job="kube-state-metrics",result="error"}[5m]))
23+
(sum(rate(kube_state_metrics_list_total{job="kube-state-metrics",result="error"}[5m])) by (cluster)
2424
/
25-
sum(rate(kube_state_metrics_list_total{job="kube-state-metrics"}[5m])))
25+
sum(rate(kube_state_metrics_list_total{job="kube-state-metrics"}[5m])) by (cluster))
2626
> 0.01
2727
for: 15m
2828
labels:
@@ -33,9 +33,9 @@ spec:
3333
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kube-state-metrics/kubestatemetricswatcherrors
3434
summary: kube-state-metrics is experiencing errors in watch operations.
3535
expr: |
36-
(sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics",result="error"}[5m]))
36+
(sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics",result="error"}[5m])) by (cluster)
3737
/
38-
sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics"}[5m])))
38+
sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics"}[5m])) by (cluster))
3939
> 0.01
4040
for: 15m
4141
labels:
@@ -46,7 +46,7 @@ spec:
4646
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kube-state-metrics/kubestatemetricsshardingmismatch
4747
summary: kube-state-metrics sharding is misconfigured.
4848
expr: |
49-
stdvar (kube_state_metrics_total_shards{job="kube-state-metrics"}) != 0
49+
stdvar (kube_state_metrics_total_shards{job="kube-state-metrics"}) by (cluster) != 0
5050
for: 15m
5151
labels:
5252
severity: critical
@@ -56,9 +56,9 @@ spec:
5656
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kube-state-metrics/kubestatemetricsshardsmissing
5757
summary: kube-state-metrics shards are missing.
5858
expr: |
59-
2^max(kube_state_metrics_total_shards{job="kube-state-metrics"}) - 1
59+
2^max(kube_state_metrics_total_shards{job="kube-state-metrics"}) by (cluster) - 1
6060
-
61-
sum( 2 ^ max by (shard_ordinal) (kube_state_metrics_shard_ordinal{job="kube-state-metrics"}) )
61+
sum( 2 ^ max by (cluster, shard_ordinal) (kube_state_metrics_shard_ordinal{job="kube-state-metrics"}) ) by (cluster)
6262
!= 0
6363
for: 15m
6464
labels:

manifests/profiles/prom/kube-state-metrics-service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 2.7.0
8+
app.kubernetes.io/version: 2.9.2
99
name: kube-state-metrics
1010
namespace: monitoring
1111
spec:

manifests/profiles/prom/kube-state-metrics-serviceAccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ metadata:
66
app.kubernetes.io/component: exporter
77
app.kubernetes.io/name: kube-state-metrics
88
app.kubernetes.io/part-of: kube-prometheus
9-
app.kubernetes.io/version: 2.7.0
9+
app.kubernetes.io/version: 2.9.2
1010
name: kube-state-metrics
1111
namespace: monitoring

manifests/profiles/prom/kube-state-metrics-serviceMonitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: exporter
66
app.kubernetes.io/name: kube-state-metrics
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 2.7.0
8+
app.kubernetes.io/version: 2.9.2
99
name: kube-state-metrics
1010
namespace: monitoring
1111
spec:

0 commit comments

Comments
 (0)